int mISDN_initialize(void)
{
char filename[256];
- int ver;
/* try to open raw socket to check kernel */
mISDNsocket = socket(PF_ISDN, SOCK_RAW, ISDN_P_BASE);
// set debug printout function
myfn.prt_debug = my_mISDNlib_debug;
- ver = init_layer3(4, &myfn); // buffer of 4
+ init_layer3(4, &myfn); // buffer of 4
/* open debug, if enabled and not only stack debugging */
if (options.deb) {
p_m_inband_send_on = 0;
p_m_inband_receive_on = 0;
p_m_dtmf = !mISDNport->ifport->nodtmf;
+ p_m_dtmf_threshold = mISDNport->ifport->dtmf_threshold;
memset(&p_m_timeout, 0, sizeof(p_m_timeout));
add_timer(&p_m_timeout, mISDN_timeout, this, 0);
SCPY(p_m_pipeline, mISDNport->ifport->interface->pipeline);
struct mISDNhead *ctrl = (struct mISDNhead *)buffer;
unsigned int *d = (unsigned int *)(buffer+MISDN_HEADER_LEN);
int ret;
+ int len = 8;
if (sock < 0)
return;
+ if (c1 == DTMF_TONE_START && c2 == 0) {
+ len = 4;
+ }
+
ctrl->prim = PH_CONTROL_REQ;
ctrl->id = 0;
*d++ = c1;
*d++ = c2;
- ret = sendto(sock, buffer, MISDN_HEADER_LEN+sizeof(int)*2, 0, NULL, 0);
+ ret = sendto(sock, buffer, MISDN_HEADER_LEN+len, 0, NULL, 0);
if (ret <= 0)
PERROR("Failed to send to socket %d\n", sock);
chan_trace_header(mISDNport, isdnport, "BCHANNEL control", DIRECTION_OUT);
int ret;
struct sockaddr_mISDN addr;
+ memset(&addr, 0, sizeof(addr));
+
if (mISDNport->b_sock[i].inuse) {
PERROR("Error: Socket already created for index %d\n", i);
return(0);
// if (port->p_m_txmix && mode == B_MODE_TRANSPARENT)
// ph_control(mISDNport, port, handle, DSP_MIX_ON, 0, "DSP-MIX", 1);
if (port->p_m_dtmf && mode == B_MODE_TRANSPARENT)
- ph_control(mISDNport, port, handle, DTMF_TONE_START, 0, "DSP-DTMF", 1);
+ ph_control(mISDNport, port, handle, DTMF_TONE_START, port->p_m_dtmf_threshold, "DSP-DTMF", 1);
if (port->p_m_crypt && mode == B_MODE_TRANSPARENT)
ph_control_block(mISDNport, port, handle, DSP_BF_ENABLE_KEY, port->p_m_crypt_key, port->p_m_crypt_key_len, "DSP-CRYPT", port->p_m_crypt_key_len);
}
class PmISDN *b_port = mISDNport->b_port[i];
int state = mISDNport->b_state[i];
int timer = -1; // no change
+#if 0
int p_m_tx_gain = 0;
int p_m_rx_gain = 0;
char *p_m_pipeline = NULL;
p_m_crypt_key_len = b_port->p_m_crypt_key_len;
p_m_crypt_key_type = /*b_port->p_m_crypt_key_type*/1;
}
+#endif
switch(event) {
case B_EVENT_USE:
p_m_load = 0;
/* to send data, tone must be on */
- if ((p_tone_name[0] || p_m_crypt_msg_loops || p_m_inband_send_on) /* what tones? */
+ if ((p_tone_name[0] || p_dov_tx || p_m_crypt_msg_loops || p_m_inband_send_on) /* what tones? */
&& (p_m_load < p_m_preload) /* not too much load? */
&& (p_state==PORT_STATE_CONNECT || p_m_mISDNport->tones || p_m_inband_send_on)) { /* connected or inband-tones? */
int tosend = p_m_preload - p_m_load, length;
tosend -= length;
}
+ /* copy dov */
+ if (p_dov_tx) {
+ tosend -= dov_tx(p, tosend);
+ }
+
/* copy tones */
if (p_tone_name[0] && tosend) {
tosend -= read_audio(p, tosend);
if (p_type == PORT_TYPE_POTS_FXS_IN && p_state == PORT_STATE_IN_OVERLAP) {
class Pfxs *pfxs = (class Pfxs *)this;
if (!pfxs->p_m_fxs_allow_dtmf) {
- PDEBUG(DEBUG_PORT, "PmISDN(%s) DTMF for FXS not yet allowed\n", p_name);
+ PDEBUG(DEBUG_PORT, "PmISDN(%s) DTMF for FXS currently disabled\n", p_name);
return;
}
SCCAT(p_dialinginfo.id, cont & DTMF_TONE_MASK);
return;
}
+ /* dov is processed */
+ if (p_dov_rx)
+ dov_rx(data, len);
+
/* inband is processed */
if (p_m_inband_receive_on)
inband_receive(data, len);
/* if no directory is given (by extension), we use interface.conf or options.conf */
if (!dir || !dir[0]) {
- if (p_m_mISDNport->ifport->tones_dir[0])
- dir = p_m_mISDNport->ifport->tones_dir;
- else if (options.tones_dir[0])
+ if (p_tones_interface[0])
+ dir = p_tones_interface;
+ else
dir = options.tones_dir;
}
}
+/* MESSAGE_VOOTP */
+void PmISDN::message_vootp(unsigned int epoint_id, int message_id, union parameter *param)
+{
+ struct lcr_msg *message;
+
+ message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_UPDATEBRIDGE);
+ message_put(message);
+
+#if 0
+does not make sense, since remote port may dejitter
+ if (param->vootp.enable) {
+ PDEBUG(DEBUG_ISDN, "PmISDN(%s) received vootp enable order, so we disable de-jitter.\n", p_name);
+ p_m_disable_dejitter = 1;
+ }
+#endif
+ update_rxoff();
+}
+
/*
* endpoint sends messages to the port
*/
int PmISDN::message_epoint(unsigned int epoint_id, int message_id, union parameter *param)
{
+ /* messages also handled by base class */
+ switch(message_id) {
+ case MESSAGE_VOOTP: /* crypt control command */
+ PDEBUG(DEBUG_ISDN, "PmISDN(%s) received VoOTP encryption\n", p_name);
+ message_vootp(epoint_id, message_id, param);
+ break;
+ }
+
if (Port::message_epoint(epoint_id, message_id, param)) {
if (message_id == MESSAGE_BRIDGE)
update_rxoff();
return 1;
}
+ /* messages not handled by base class */
switch(message_id) {
case MESSAGE_mISDNSIGNAL: /* user command */
PDEBUG(DEBUG_ISDN, "PmISDN(%s) received special ISDN SIGNAL %d.\n", p_name, param->mISDNsignal.message);
int tx_dejitter = 0;
/* call bridges in user space OR crypto OR recording */
- if (p_bridge || p_m_crypt_msg_loops || p_m_crypt_listen || p_record || p_tap || p_m_inband_receive_on) {
+ if (p_bridge || p_m_crypt_msg_loops || p_m_crypt_listen || p_record || p_tap || p_m_inband_receive_on || p_dov_rx) {
/* rx IS required */
if (p_m_rxoff) {
/* turn on RX */
struct mbuffer *mb;
struct l3_msg *l3m;
char byte;
- int ret;
+ int __attribute__((__unused__)) ret;
/* unset global semaphore */
upqueue_avail = 0;
// this is no problem.
upqueue_avail = 1;
char byte = 0;
- int ret;
+ int __attribute__((__unused__)) ret;
ret = write(upqueue_pipe[1], &byte, 1);
}
return 0;
struct mISDN_devinfo devinfo;
int port = 0, ret;
+ memset(&devinfo, 0, sizeof(devinfo));
+
/* resolve name */
while (port < cnt) {
devinfo.id = port;
return (port);
}
+#ifdef ISDN_P_FXS_POTS
/* handle frames from pots */
static int pots_sock_callback(struct lcr_fd *fd, unsigned int what, void *instance, int i)
{
return 0;
}
+#endif
/*
* global function to add a new card (port)
struct mISDN_devinfo devinfo;
unsigned int protocol, prop;
+ memset(&devinfo, 0, sizeof(devinfo));
+
/* check port counts */
ret = ioctl(mISDNsocket, IMGETCOUNT, &cnt);
if (ret < 0) {
struct mISDNhead *hh = (struct mISDNhead *)buf;
int ret;
+ if ((ret = Port::bridge_rx(data, length)))
+ return ret;
+
if (p_m_b_index < 0)
return -EIO;
if (p_m_mISDNport->b_state[p_m_b_index] != B_STATE_ACTIVE)
/* check if high priority tones exist
* ignore data in this case
*/
- if (p_tone_name[0] || p_m_crypt_msg_loops || p_m_inband_send_on)
+ if (p_tone_name[0] || p_dov_tx || p_m_crypt_msg_loops || p_m_inband_send_on)
return -EBUSY;
/* preload procedure