Changeset 3000

Timestamp:

Nov 9, 2009 1:40:26 PM (14 years ago)

Author:

nanang

Message:

Ticket #957: Fixed 0.0.0.0:0 address returned by SIP TLS client transport, which would cause 0.0.0.0:0 address in SIP via header.

Location:

pjproject/trunk

Files:

• pjlib/src/pj/ssl_sock_ossl.c (modified) (1 diff)
• pjsip/src/pjsip/sip_transport_tls.c (modified) (3 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -2090 +2090 @@
     status = pj_sock_getsockname(ssock->sock, &ssock->local_addr,
                                  &ssock->addr_len);
-    if (status != PJ_SUCCESS)
-        pj_sockaddr_cp(&ssock->local_addr, localaddr);
+    /* Note that we may not get an IP address here. This can
+     * happen for example on Windows, where getsockname()
+     * would return 0.0.0.0 if socket has just started the
+     * async connect. In this case, just leave the local
+     * address with 0.0.0.0 for now; it will be updated
+     * once the socket is established.
+     */
 
     /* Set remote address */

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -528 +528 @@
 
     tls->base.addr_len = sizeof(pj_sockaddr_in);
-    pj_memcpy(&tls->base.local_addr, local, sizeof(pj_sockaddr_in));
-    sockaddr_to_host_port(pool, &tls->base.local_name, local);
+    
+    /* Set initial local address */
+    if (!pj_sockaddr_has_addr(local)) {
+        pj_sockaddr_cp(&tls->base.local_addr,
+                       &listener->factory.local_addr);
+    } else {
+        pj_sockaddr_cp(&tls->base.local_addr, local);
+    }
+    
+    sockaddr_to_host_port(pool, &tls->base.local_name, 
+                          (pj_sockaddr_in*)&tls->base.local_addr);
     sockaddr_to_host_port(pool, &tls->base.remote_name, remote);
 
@@ -857 +866 @@
         pj_ssl_sock_info info;
 
-        /* Update (again) local address, just in case local address currently
-         * set is different now that asynchronous connect() is started.
+        /* Update local address, just in case local address currently set is 
+         * different now that asynchronous connect() is started.
          */
 
@@ -864 +873 @@
         status = pj_ssl_sock_get_info(tls->ssock, &info);
         if (status == PJ_SUCCESS) {
-            pj_sockaddr_in *tp_addr = (pj_sockaddr_in*)&tls->base.local_addr;
-
-            pj_assert(pj_sockaddr_get_len((pj_sockaddr_t*)&info.local_addr) <= 
-                      sizeof(local_addr));
-            pj_sockaddr_cp((pj_sockaddr_t*)&local_addr, (pj_sockaddr_t*)&info.local_addr);
-
-            /* Some systems (like old Win32 perhaps) may not set local address
-             * properly before socket is fully connected.
-             */
-            if (tp_addr->sin_addr.s_addr != local_addr.sin_addr.s_addr &&
-                local_addr.sin_addr.s_addr != 0) 
+            pj_uint16_t new_port;
+
+            new_port = pj_sockaddr_get_port((pj_sockaddr_t*)&info.local_addr);
+
+            if (pj_sockaddr_has_addr((pj_sockaddr_t*)&info.local_addr)) {
+                /* Update sockaddr */
+                pj_sockaddr_cp((pj_sockaddr_t*)&tls->base.local_addr,
+                               (pj_sockaddr_t*)&info.local_addr);
+            } else if (new_port && new_port != pj_sockaddr_get_port(
+                                        (pj_sockaddr_t*)&tls->base.local_addr))
             {
-                tp_addr->sin_addr.s_addr = local_addr.sin_addr.s_addr;
-                tp_addr->sin_port = local_addr.sin_port;
-                sockaddr_to_host_port(tls->base.pool, &tls->base.local_name,
-                                      &local_addr);
+                /* Update port only */
+                pj_sockaddr_set_port((pj_sockaddr_t*)&tls->base.local_addr, 
+                                     new_port);
             }
+
+            sockaddr_to_host_port(tls->base.pool, &tls->base.local_name,
+                                  (pj_sockaddr_in*)&tls->base.local_addr);
         }
-        
+
         PJ_LOG(4,(tls->base.obj_name, 
                   "TLS transport %.*s:%d is connecting to %.*s:%d...",