Changeset 1601 for pjproject/trunk/pjlib/src/pj/ip_helper_win32.c

Timestamp:

Dec 1, 2007 8:52:57 AM (16 years ago)

Author:

bennylp

Message:

More ticket #415: more IPv6 and some reorganization of the source codes

File:

• pjproject/trunk/pjlib/src/pj/ip_helper_win32.c (modified) (8 diffs)

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

@@ -28 +28 @@
 #   define PMIB_ICMP_EX void*
 #endif
+#include <winsock2.h>
+
+/* If you encounter error "Cannot open include file: 'Iphlpapi.h' here,
+ * you need to install newer Platform SDK. Presumably you're using
+ * Microsoft Visual Studio 6?
+ */
 #include <Iphlpapi.h>
 
@@ -42 +48 @@
                                            PULONG pdwSize, 
                                            BOOL bOrder);
+#if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
+typedef DWORD (WINAPI *PFN_GetAdapterAddresses)(ULONG Family,
+                                                ULONG Flags,
+                                                PVOID Reserved,
+                                                PIP_ADAPTER_ADDRESSES AdapterAddresses,
+                                                PULONG SizePointer);
+#endif  /* PJ_HAS_IPV6 */
 typedef DWORD (WINAPI *PFN_GetIpForwardTable)(PMIB_IPFORWARDTABLE pIpForwardTable,
                                               PULONG pdwSize, 
@@ -49 +62 @@
 static HANDLE s_hDLL;
 static PFN_GetIpAddrTable s_pfnGetIpAddrTable;
+#if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
+    static PFN_GetAdapterAddresses s_pfnGetAdapterAddresses;
+#endif  /* PJ_HAS_IPV6 */
 static PFN_GetIpForwardTable s_pfnGetIpForwardTable;
 static PFN_GetIfEntry s_pfnGetIfEntry;
+
 
 static void unload_iphlp_module(void)
@@ -58 +75 @@
     s_pfnGetIpAddrTable = NULL;
     s_pfnGetIpForwardTable = NULL;
+    s_pfnGetIfEntry = NULL;
+#if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
+    s_pfnGetAdapterAddresses = NULL;
+#endif
 }
 
@@ -91 +112 @@
 }
 
+#if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
+static DWORD MyGetAdapterAddresses(ULONG Family,
+                                   ULONG Flags,
+                                   PVOID Reserved,
+                                   PIP_ADAPTER_ADDRESSES AdapterAddresses,
+                                   PULONG SizePointer)
+{
+    if(NULL == s_pfnGetAdapterAddresses) {
+        s_pfnGetAdapterAddresses = (PFN_GetAdapterAddresses) 
+            GetIpHlpApiProc(PJ_T("GetAdapterAddresses"));
+    }
+    
+    if(NULL != s_pfnGetAdapterAddresses) {
+        return s_pfnGetAdapterAddresses(Family, Flags, Reserved,
+                                        AdapterAddresses, SizePointer);
+    }
+    
+    return ERROR_NOT_SUPPORTED;
+}
+#endif  /* PJ_HAS_IPV6 */
 
 #if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
@@ -125 +166 @@
 }
 
-/*
- * Enumerate the local IP interface currently active in the host.
- */
-PJ_DEF(pj_status_t) pj_enum_ip_interface(unsigned *p_cnt,
-                                         pj_in_addr ifs[])
+/* Enumerate local IP interface using GetIpAddrTable()
+ * for IPv4 addresses only.
+ */
+static pj_status_t enum_ipv4_interface(unsigned *p_cnt,
+                                       pj_sockaddr ifs[])
 {
     /* Provide enough buffer or otherwise it will fail with 
@@ -160 +201 @@
         MIB_IFROW ifRow;
 
-        /* Some Windows returns 0.0.0.0! */
+        /* Ignore 0.0.0.0 address (interface is down?) */
         if (pTab->table[i].dwAddr == 0)
             continue;
@@ -175 +216 @@
 #endif
 
-        ifs[*p_cnt].s_addr = pTab->table[i].dwAddr;
+        ifs[*p_cnt].ipv4.sin_family = PJ_AF_INET;
+        ifs[*p_cnt].ipv4.sin_addr.s_addr = pTab->table[i].dwAddr;
         (*p_cnt)++;
     }
 
     return PJ_SUCCESS;
-
-}
-
+}
+
+
+/* Enumerate local IP interface using GetAdapterAddresses(),
+ * which works for both IPv4 and IPv6.
+ */
+#if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
+static pj_status_t enum_ipv4_ipv6_interface(int af,
+                                            unsigned *p_cnt,
+                                            pj_sockaddr ifs[])
+{
+    pj_uint8_t buffer[1024];
+    IP_ADAPTER_ADDRESSES *adapter = (IP_ADAPTER_ADDRESSES*)buffer;
+    ULONG size = sizeof(buffer);
+    unsigned i;
+    DWORD rc;
+
+    rc = MyGetAdapterAddresses(af, 0, NULL, adapter, &size);
+    if (rc != ERROR_SUCCESS)
+        return PJ_RETURN_OS_ERROR(rc);
+
+    for (i=0; i<*p_cnt && adapter; ++i, adapter = adapter->Next) {
+        SOCKET_ADDRESS *pAddr = &adapter->FirstUnicastAddress->Address;
+        ifs[i].addr.sa_family = pAddr->lpSockaddr->sa_family;
+        pj_memcpy(&ifs[i], pAddr->lpSockaddr, pAddr->iSockaddrLength);
+    }
+
+    return PJ_SUCCESS;
+}
+#endif
+
+
+/*
+ * Enumerate the local IP interface currently active in the host.
+ */
+PJ_DEF(pj_status_t) pj_enum_ip_interface(int af,
+                                         unsigned *p_cnt,
+                                         pj_sockaddr ifs[])
+{
+    pj_status_t status = -1;
+
+    PJ_ASSERT_RETURN(p_cnt && ifs, PJ_EINVAL);
+    PJ_ASSERT_RETURN(af==PJ_AF_UNSPEC || af==PJ_AF_INET || af==PJ_AF_INET6,
+                     PJ_EAFNOTSUP);
+
+#if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
+    status = enum_ipv4_ipv6_interface(af, p_cnt, ifs);
+    if (status != PJ_SUCCESS && (af==PJ_AF_INET || af==PJ_AF_UNSPEC))
+        status = enum_ipv4_interface(p_cnt, ifs);
+    return status;
+#else
+    if (af==PJ_AF_INET6)
+        return PJ_EIPV6NOTSUP;
+    else if (af != PJ_AF_INET && af != PJ_AF_UNSPEC)
+        return PJ_EAFNOTSUP;
+
+    status = enum_ipv4_interface(p_cnt, ifs);
+    return status;
+#endif
+}
 
 /*