SIP: Fix incoming re-invite

[lcr.git] / mISDN.cpp

diff --git a/mISDN.cpp b/mISDN.cpp
index a7facb6..d67d0e8 100644 (file)
--- a/mISDN.cpp
+++ b/mISDN.cpp
@@ -405,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);
@@ -1224,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;
        }
 
@@ -1817,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;
@@ -1892,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) {