Changeset 1647 for pjproject/trunk/pjlib/src/pj/ip_helper_symbian.cpp

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/ip_helper_symbian.cpp (modified) (3 diffs)

pjproject/trunk/pjlib/src/pj/ip_helper_symbian.cpp

@@ -21 +21 @@
 #include <pj/assert.h>
 #include <pj/errno.h>
+#include <pj/log.h>
 #include <pj/string.h>
 #include <pj/compat/socket.h>
@@ -26 +27 @@
 
 #include "os_symbian.h"
+
+#define THIS_FILE       "ip_helper_symbian.cpp"
+#define TRACE_ME        0
 
 static pj_status_t rsock_enum_interface(int af,
@@ -59 +63 @@
         TInetAddr &iAddress = info().iAddress;
         int namelen;
+
+#if TRACE_ME
+                if (1) {
+                        pj_sockaddr a;
+                        char ipaddr[PJ_INET6_ADDRSTRLEN+2];
+                        
+                        namelen = sizeof(pj_sockaddr);
+                        if (PjSymbianOS::Addr2pj(iAddress, a, &namelen, 
+                                                                         PJ_FALSE) == PJ_SUCCESS) 
+                        {
+                                PJ_LOG(5,(THIS_FILE, "Enum: found address %s", 
+                                                pj_sockaddr_print(&a, ipaddr, sizeof(ipaddr), 2)));
+                        }
+                }
+#endif
         
-        if (iAddress.Family() != (unsigned)af) {
+        namelen = sizeof(ifs[i]);
+        if (PjSymbianOS::Addr2pj(iAddress, ifs[i], &namelen, 
+                                                         PJ_TRUE) != PJ_SUCCESS)
+        {
             continue;
         }
-        
-        namelen = sizeof(ifs[i]);
-        if (PjSymbianOS::Addr2pj(iAddress, ifs[i], &namelen) != PJ_SUCCESS)
-            continue;
+
+        if (ifs[i].addr.sa_family != af)
+                    continue;
         
         ++i;