Changeset 1647 for pjproject/trunk/pjlib/src/pj/sock_common.c

Timestamp:

Dec 31, 2007 11:26:21 AM (17 years ago)

Author:

bennylp

Message:

Fixed IPv6/IPv4 address issue in Symbian: Symbian, at least 9.1, seems to have dual stack IP, so IPv4 address can be returned as a mapped IPv6 address

File:

• pjproject/trunk/pjlib/src/pj/sock_common.c (modified) (3 diffs)

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

@@ -456 +456 @@
     status = pj_getaddrinfo(af, pj_gethostname(), &count, &ai);
     if (status == PJ_SUCCESS) {
-        pj_memcpy(pj_sockaddr_get_addr(addr),
-                  pj_sockaddr_get_addr(&ai.ai_addr),
-                  pj_sockaddr_get_addr_len(&ai.ai_addr));
+        pj_assert(ai.ai_addr.addr.sa_family == (pj_uint16_t)af);
+        pj_sockaddr_copy_addr(addr, &ai.ai_addr);
     }
 
@@ -466 +465 @@
      */
     if (status != PJ_SUCCESS || !pj_sockaddr_has_addr(addr) ||
-        (af==PJ_AF_INET && (pj_ntohl(addr->ipv4.sin_addr.s_addr) >> 24)==127))
+                (af==PJ_AF_INET && (pj_ntohl(addr->ipv4.sin_addr.s_addr) >> 24)==127))
     {
-        status = pj_getdefaultipinterface(af, addr);
+                status = pj_getdefaultipinterface(af, addr);
     }
 
     /* If failed, get the first available interface */
     if (status != PJ_SUCCESS) {
-        pj_sockaddr itf[1];
-        unsigned count = PJ_ARRAY_SIZE(itf);
-
-        status = pj_enum_ip_interface(af, &count, itf);
-        if (status == PJ_SUCCESS) {
-            itf[0].addr.sa_family = (pj_uint16_t)af;
-            pj_memcpy(pj_sockaddr_get_addr(addr),
-                      pj_sockaddr_get_addr(&itf[0]),
-                      pj_sockaddr_get_addr_len(&itf[0]));
-        }
+                pj_sockaddr itf[1];
+                unsigned count = PJ_ARRAY_SIZE(itf);
+        
+                status = pj_enum_ip_interface(af, &count, itf);
+                if (status == PJ_SUCCESS) {
+                    pj_assert(itf[0].addr.sa_family == (pj_uint16_t)af);
+                    pj_sockaddr_copy_addr(addr, &itf[0]);
+                }
     }
 
     /* If else fails, returns loopback interface as the last resort */
     if (status != PJ_SUCCESS) {
-        if (af==PJ_AF_INET) {
-            addr->ipv4.sin_addr.s_addr = pj_htonl (0x7f000001);
-        } else {
-            pj_in6_addr *s6_addr;
-
-            s6_addr = (pj_in6_addr*) pj_sockaddr_get_addr(addr);
-            pj_bzero(s6_addr, sizeof(pj_in6_addr));
-            s6_addr->s6_addr[15] = 1;
-        }
-        status = PJ_SUCCESS;
+                if (af==PJ_AF_INET) {
+                    addr->ipv4.sin_addr.s_addr = pj_htonl (0x7f000001);
+                } else {
+                    pj_in6_addr *s6_addr;
+        
+                    s6_addr = (pj_in6_addr*) pj_sockaddr_get_addr(addr);
+                    pj_bzero(s6_addr, sizeof(pj_in6_addr));
+                    s6_addr->s6_addr[15] = 1;
+                }
+                status = PJ_SUCCESS;
     }
 
@@ -553 +550 @@
     }
 
-    pj_memcpy(pj_sockaddr_get_addr(addr),
-              pj_sockaddr_get_addr(&a),
-              pj_sockaddr_get_addr_len(&a));
+    pj_sockaddr_copy_addr(addr, &a);
 
     /* Success */