Changeset 3029 for pjproject/trunk

Timestamp:

Dec 8, 2009 4:53:29 PM (15 years ago)

Author:

bennylp

Message:

Fixed ticket #1000: IPv6 interface enumeration fails due to typo error in Windows targets

File:

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

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

@@ -45 +45 @@
                                            PULONG pdwSize, 
                                            BOOL bOrder);
-#if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
 typedef DWORD (WINAPI *PFN_GetAdapterAddresses)(ULONG Family,
                                                 ULONG Flags,
@@ -51 +50 @@
                                                 PIP_ADAPTER_ADDRESSES AdapterAddresses,
                                                 PULONG SizePointer);
-#endif  /* PJ_HAS_IPV6 */
 typedef DWORD (WINAPI *PFN_GetIpForwardTable)(PMIB_IPFORWARDTABLE pIpForwardTable,
                                               PULONG pdwSize, 
@@ -59 +57 @@
 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_GetAdapterAddresses s_pfnGetAdapterAddresses;
 static PFN_GetIpForwardTable s_pfnGetIpForwardTable;
 static PFN_GetIfEntry s_pfnGetIfEntry;
@@ -73 +69 @@
     s_pfnGetIpForwardTable = NULL;
     s_pfnGetIfEntry = NULL;
-#if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
     s_pfnGetAdapterAddresses = NULL;
-#endif
 }
 
@@ -109 +103 @@
 }
 
-#if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
 static DWORD MyGetAdapterAddresses(ULONG Family,
                                    ULONG Flags,
@@ -118 +111 @@
     if(NULL == s_pfnGetAdapterAddresses) {
         s_pfnGetAdapterAddresses = (PFN_GetAdapterAddresses) 
-            GetIpHlpApiProc("GetAdapterAddresses");
+            GetIpHlpApiProc("GetAdaptersAddresses");
     }
     
@@ -128 +121 @@
     return ERROR_NOT_SUPPORTED;
 }
-#endif  /* PJ_HAS_IPV6 */
 
 #if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
@@ -231 +223 @@
  * 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];
+    pj_uint8_t buffer[1600];
     IP_ADAPTER_ADDRESSES *adapter = (IP_ADAPTER_ADDRESSES*)buffer;
     ULONG size = sizeof(buffer);
@@ -252 +243 @@
     }
 
+    *p_cnt = i;
     return PJ_SUCCESS;
 }
-#endif
 
 
@@ -270 +261 @@
                      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
 }