Changeset 2519 for pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

Timestamp:

Mar 17, 2009 11:25:52 AM (15 years ago)

Author:

bennylp

Message:

Ticket #755: segfault with IPv6 transport (thanks Cedric Levequ for the report)

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c (modified) (9 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

@@ -495 +495 @@
 
     } else {
+        /* If bound address specifies "INADDR_ANY" (IPv6), get the
+         * IP address of local hostname
+         */
+        pj_uint32_t loop6[4] = { 0, 0, 0, 0};
+
         bound_name->port = pj_ntohs(tmp_addr.ipv6.sin6_port);
+
+        if (pj_memcmp(&tmp_addr.ipv6.sin6_addr, loop6, sizeof(loop6))==0) {
+            status = pj_gethostip(tmp_addr.addr.sa_family, &tmp_addr);
+            if (status != PJ_SUCCESS)
+                return status;
+        }
+
         status = pj_inet_ntop(tmp_addr.addr.sa_family, 
                               pj_sockaddr_get_addr(&tmp_addr),
                               hostbuf, hostbufsz);
+        if (status == PJ_SUCCESS) {
+            bound_name->host.slen = pj_ansi_strlen(hostbuf);
+        }
     }
 
@@ -510 +525 @@
 {
     enum { INFO_LEN = 80 };
-    char local_addr[PJ_INET6_ADDRSTRLEN];
+    char local_addr[PJ_INET6_ADDRSTRLEN+10];
 
     pj_assert(a_name->host.slen != 0);
@@ -522 +537 @@
     }
 
-    pj_inet_ntop(tp->base.local_addr.addr.sa_family,
-                 pj_sockaddr_get_addr(&tp->base.local_addr), 
-                 local_addr, sizeof(local_addr));
+    pj_sockaddr_print(&tp->base.local_addr, local_addr, sizeof(local_addr), 3);
 
     pj_ansi_snprintf( 
-        tp->base.info, INFO_LEN, "udp %s:%d [published as %s:%d]",
+        tp->base.info, INFO_LEN, "udp %s [published as %s:%d]",
         local_addr,
-        pj_sockaddr_get_port(&tp->base.local_addr),
         tp->base.local_name.host.ptr,
         tp->base.local_name.port);
@@ -640 +652 @@
     pj_pool_t *pool;
     struct udp_transport *tp;
-    const char *format;
+    const char *format, *ipv6_quoteb, *ipv6_quotee;
     unsigned i;
     pj_status_t status;
@@ -648 +660 @@
 
     /* Object name. */
-    if (type & PJSIP_TRANSPORT_IPV6)
+    if (type & PJSIP_TRANSPORT_IPV6) {
         format = "udpv6%p";
-    else
+        ipv6_quoteb = "[";
+        ipv6_quotee = "]";
+    } else {
         format = "udp%p";
+        ipv6_quoteb = ipv6_quotee = "";
+    }
 
     /* Create pool. */
@@ -768 +784 @@
     if (p_transport)
         *p_transport = &tp->base;
-
+    
     PJ_LOG(4,(tp->base.obj_name, 
-              "SIP %s started, published address is %.*s:%d",
+              "SIP %s started, published address is %s%.*s%s:%d",
               pjsip_transport_get_type_desc((pjsip_transport_type_e)tp->base.key.type),
+              ipv6_quoteb,
               (int)tp->base.local_name.host.slen,
               tp->base.local_name.host.ptr,
+              ipv6_quotee,
               tp->base.local_name.port));
 
@@ -860 +878 @@
     pj_sock_t sock;
     pj_status_t status;
-    char addr_buf[PJ_INET_ADDRSTRLEN];
+    char addr_buf[PJ_INET6_ADDRSTRLEN];
     pjsip_host_port bound_name;
 
@@ -884 +902 @@
     }
 
-    return pjsip_udp_transport_attach( endpt, sock, a_name, async_cnt, 
-                                       p_transport);
+    return pjsip_udp_transport_attach2(endpt, PJSIP_TRANSPORT_UDP6,
+                                       sock, a_name, async_cnt, p_transport);
 }
 
@@ -982 +1000 @@
 
     if (option & PJSIP_UDP_TRANSPORT_DESTROY_SOCKET) {
-        char addr_buf[PJ_INET_ADDRSTRLEN];
+        char addr_buf[PJ_INET6_ADDRSTRLEN];
         pjsip_host_port bound_name;