SIP: Fix incoming re-invite

[lcr.git] / mISDN.cpp

diff --git a/mISDN.cpp b/mISDN.cpp
index 1431642..d67d0e8 100644 (file)
--- a/mISDN.cpp
+++ b/mISDN.cpp
@@ -63,7 +63,6 @@ static struct mi_ext_fn_s myfn;
 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);
@@ -76,7 +75,7 @@ int mISDN_initialize(void)
        // 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) {
@@ -406,6 +405,8 @@ static int _bchannel_create(struct mISDNport *mISDNport, int i)
        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);
@@ -604,6 +605,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
        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;
@@ -619,6 +621,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
                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:
@@ -964,7 +967,7 @@ void PmISDN::load_tx(void)
                        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; 
@@ -1004,6 +1007,11 @@ void PmISDN::load_tx(void)
                                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);
@@ -1141,6 +1149,10 @@ void PmISDN::bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len
                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);
@@ -1214,9 +1226,9 @@ void PmISDN::set_tone(const char *dir, const char *tone)
 
        /* 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;
        }
 
@@ -1434,17 +1446,44 @@ void PmISDN::message_crypt(unsigned int epoint_id, int message_id, union paramet
 
 }
 
+/* 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);
@@ -1472,7 +1511,7 @@ void PmISDN::update_rxoff(void)
        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 */
@@ -1533,7 +1572,7 @@ static int mISDN_upqueue(struct lcr_fd *fd, unsigned int what, void *instance, i
        struct mbuffer *mb;
        struct l3_msg *l3m;
        char byte;
-       int ret;
+       int __attribute__((__unused__)) ret;
 
        /* unset global semaphore */
        upqueue_avail = 0;
@@ -1769,7 +1808,7 @@ int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3
                // 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;
@@ -1780,6 +1819,8 @@ int mISDN_getportbyname(int sock, int cnt, char *portname)
        struct mISDN_devinfo devinfo;
        int port = 0, ret;
 
+       memset(&devinfo, 0, sizeof(devinfo));
+
        /* resolve name */
        while (port < cnt) {
                devinfo.id = port;
@@ -1796,6 +1837,7 @@ int mISDN_getportbyname(int sock, int cnt, char *portname)
        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)
 {
@@ -1818,12 +1860,10 @@ static int pots_sock_callback(struct lcr_fd *fd, unsigned int what, void *instan
        case PH_CONTROL_IND:
                cont = *((unsigned int *)(buffer + MISDN_HEADER_LEN));
                /* l1-control is sent to LCR */
-#ifdef ISDN_P_FXS_POTS
                if (mISDNport->ntmode)
                        stack2manager_fxs(mISDNport, cont);
                else
                        PERROR("FXO not supported!\n");
-#endif
                break;
        case PH_ACTIVATE_REQ:
                break;
@@ -1834,6 +1874,7 @@ static int pots_sock_callback(struct lcr_fd *fd, unsigned int what, void *instan
 
        return 0;
 }
+#endif
 
 /*
  * global function to add a new card (port)
@@ -1855,6 +1896,8 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport)
        struct mISDN_devinfo devinfo;
        unsigned int protocol, prop;
 
+       memset(&devinfo, 0, sizeof(devinfo));
+
        /* check port counts */
        ret = ioctl(mISDNsocket, IMGETCOUNT, &cnt);
        if (ret < 0) {
@@ -2274,6 +2317,9 @@ int PmISDN::bridge_rx(unsigned char *data, int length)
        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)
@@ -2282,7 +2328,7 @@ int PmISDN::bridge_rx(unsigned char *data, int length)
        /* 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