Changeset 381:a9cd82f1414e in verona

Timestamp:

Dec 6, 2011 2:35:43 PM (18 months ago)

Author:

laurent <laurent@…>

Branch:

default

Message:

bug fix : crash if local sip port is busy

File:

• phapi/phapi.c (modified) (3 diffs)

phapi/phapi.c

@@ -4526 +4526 @@
 }
 
+int phListenAddr(int local_sip_port)
+{
+        int i, cpt = 0;
+        int secure = 0;
+        int proto = phcfg.transport;
+
+        for (cpt = 0; cpt < 5; cpt++)
+        {
+                if (phcfg.local_ip_addr[0] == 0)
+                        i = eXosip_listen_addr(proto, NULL,local_sip_port + cpt, AF_INET, secure);
+                else
+                        i = eXosip_listen_addr(proto, phcfg.local_ip_addr,local_sip_port + cpt, AF_INET, secure);
+
+                if(!i)
+                        break;
+        }
+
+        return i;
+}
+
 PHAPI_EXPORT int
 phInit(phCallbacks_t *cbk, char * server, int asyncmode)
 {
         int i;
-        int proto;
-        int secure;
         const char *tmp;
         int nat_refresh_time = 0;
@@ -4582 +4600 @@
         }
 
-
-        proto = phcfg.transport;
-        secure = 0;
-
-
         i = eXosip_init();
         if (i)
@@ -4601 +4614 @@
         }
 
-        if (phcfg.local_ip_addr[0] == 0)
-                eXosip_listen_addr(proto, NULL, atoi(phcfg.sipport), AF_INET, secure);
-        else
-                eXosip_listen_addr(proto, phcfg.local_ip_addr, atoi(phcfg.sipport), AF_INET, secure);
+        i = phListenAddr(atoi(phcfg.sipport));
+        if(i)
+                return -1;
 
         {