Changeset 1636 for pjproject/trunk

Timestamp:

Dec 20, 2007 11:23:07 AM (17 years ago)

Author:

bennylp

Message:

Related to Ticket #429: when bind address is specified and public address is not, the bind address should be used as the public address (thanks Arie Velthoen)

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_core.c (modified) (1 diff)
• pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -1300 +1300 @@
         pj_bzero(p_pub_addr, sizeof(pj_sockaddr));
 
-        status = pj_gethostip(af, p_pub_addr);
-        if (status != PJ_SUCCESS) {
-            pjsua_perror(THIS_FILE, "Unable to get local host IP", status);
-            pj_sock_close(sock);
-            return status;
+        if (pj_sockaddr_has_addr(&bind_addr)) {
+            pj_sockaddr_copy_addr(p_pub_addr, &bind_addr);
+        } else {
+            status = pj_gethostip(af, p_pub_addr);
+            if (status != PJ_SUCCESS) {
+                pjsua_perror(THIS_FILE, "Unable to get local host IP", status);
+                pj_sock_close(sock);
+                return status;
+            }
         }
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -347 +347 @@
 
         } else {
-            pj_sockaddr addr;
-
-            /* Get local IP address. */
-            status = pj_gethostip(pj_AF_INET(), &addr);
-            if (status != PJ_SUCCESS)
-                goto on_error;
+
+            if (bound_addr.sin_addr.s_addr == 0) {
+                pj_sockaddr addr;
+
+                /* Get local IP address. */
+                status = pj_gethostip(pj_AF_INET(), &addr);
+                if (status != PJ_SUCCESS)
+                    goto on_error;
+
+                bound_addr.sin_addr.s_addr = addr.ipv4.sin_addr.s_addr;
+            }
 
             for (i=0; i<2; ++i) {
                 pj_sockaddr_in_init(&mapped_addr[i], NULL, 0);
-                mapped_addr[i].sin_addr.s_addr = addr.ipv4.sin_addr.s_addr;
+                mapped_addr[i].sin_addr.s_addr = bound_addr.sin_addr.s_addr;
             }