Changeset 1409

Timestamp:

Jul 28, 2007 1:58:36 AM (17 years ago)

Author:

bennylp

Message:

Ticket #358: link dynamically with IPHLPAPI.DLL

File:

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

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

@@ -35 +35 @@
 #include <pj/string.h>
 
+typedef DWORD (WINAPI *PFN_GetIpAddrTable)(PMIB_IPADDRTABLE pIpAddrTable, 
+                                           PULONG pdwSize, 
+                                           BOOL bOrder);
+typedef DWORD (WINAPI *PFN_GetIpForwardTable)(PMIB_IPFORWARDTABLE pIpForwardTable,
+                                              PULONG pdwSize, 
+                                              BOOL bOrder);
+
+static HANDLE s_hDLL;
+static PFN_GetIpAddrTable s_pfnGetIpAddrTable;
+static PFN_GetIpForwardTable s_pfnGetIpForwardTable;
+
+static unload_iphlp_module(void)
+{
+    FreeLibrary(s_hDLL);
+    s_hDLL = NULL;
+    s_pfnGetIpAddrTable = NULL;
+    s_pfnGetIpForwardTable = NULL;
+}
+
+static FARPROC GetIpHlpApiProc(pj_char_t *lpProcName)
+{
+    if(NULL == s_hDLL) {
+        s_hDLL = LoadLibrary(PJ_T("IpHlpApi"));
+        if(NULL != s_hDLL) {
+            pj_atexit(&unload_iphlp_module);
+        }
+    }
+        
+    if(NULL != s_hDLL)
+        return GetProcAddress(s_hDLL, lpProcName);
+    
+    return NULL;
+}
+
+static DWORD MyGetIpAddrTable(PMIB_IPADDRTABLE pIpAddrTable, 
+                              PULONG pdwSize, 
+                              BOOL bOrder)
+{
+    if(NULL == s_pfnGetIpAddrTable) {
+        s_pfnGetIpAddrTable = (PFN_GetIpAddrTable) 
+            GetIpHlpApiProc(PJ_T("GetIpAddrTable"));
+    }
+    
+    if(NULL != s_pfnGetIpAddrTable) {
+        return s_pfnGetIpAddrTable(pIpAddrTable, pdwSize, bOrder);
+    }
+    
+    return ERROR_NOT_SUPPORTED;
+}
+
+
+static DWORD MyGetIpForwardTable(PMIB_IPFORWARDTABLE pIpForwardTable, 
+                                 PULONG pdwSize, 
+                                 BOOL bOrder)
+{
+    if(NULL == s_pfnGetIpForwardTable) {
+        s_pfnGetIpForwardTable = (PFN_GetIpForwardTable) 
+            GetIpHlpApiProc(PJ_T("GetIpForwardTable"));
+    }
+    
+    if(NULL != s_pfnGetIpForwardTable) {
+        return s_pfnGetIpForwardTable(pIpForwardTable, pdwSize, bOrder);
+    }
+    
+    return ERROR_NOT_SUPPORTED;
+}
 
 /*
@@ -49 +115 @@
     ULONG tabSize;
     unsigned i, count;
-    DWORD rc;
+    DWORD rc = NO_ERROR;
 
     PJ_ASSERT_RETURN(p_cnt && ifs, PJ_EINVAL);
@@ -57 +123 @@
     /* Get IP address table */
     tabSize = sizeof(ipTabBuff);
-    rc = GetIpAddrTable(pTab, &tabSize, FALSE);
+
+    rc = MyGetIpAddrTable(pTab, &tabSize, FALSE);
     if (rc != NO_ERROR)
         return PJ_RETURN_OS_ERROR(rc);
@@ -92 +159 @@
     ULONG tabSize;
     unsigned i, count;
-    DWORD rc;
+    DWORD rc = NO_ERROR;
 
     PJ_ASSERT_RETURN(p_cnt && routes, PJ_EINVAL);
@@ -101 +168 @@
     /* First get IP address table */
     tabSize = sizeof(ipTabBuff);
-    rc = GetIpAddrTable(pIpTab, &tabSize, FALSE);
+    rc = MyGetIpAddrTable(pIpTab, &tabSize, FALSE);
     if (rc != NO_ERROR)
         return PJ_RETURN_OS_ERROR(rc);
@@ -107 +174 @@
     /* Next get IP route table */
     tabSize = sizeof(rtabBuff);
-    rc = GetIpForwardTable(prTab, &tabSize, 1);
+
+    rc = MyGetIpForwardTable(prTab, &tabSize, 1);
     if (rc != NO_ERROR)
         return PJ_RETURN_OS_ERROR(rc);
@@ -139 +207 @@
 }
 
-
-