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

Timestamp:

Sep 24, 2007 7:46:41 PM (17 years ago)

Author:

bennylp

Message:

Ticket #382: Updated ICE from draft-ietf-mmusic-ice-14 to ice-18 specification, and also done some other tweaks as well

File:

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

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

@@ -35 +35 @@
 #include <pj/string.h>
 
+#ifndef PJ_IP_HELPER_IGNORE_LOOPBACK_IF
+#   define PJ_IP_HELPER_IGNORE_LOOPBACK_IF      1
+#endif
+
 typedef DWORD (WINAPI *PFN_GetIpAddrTable)(PMIB_IPADDRTABLE pIpAddrTable, 
                                            PULONG pdwSize, 
@@ -41 +45 @@
                                               PULONG pdwSize, 
                                               BOOL bOrder);
+typedef DWORD (WINAPI *PFN_GetIfEntry)(PMIB_IFROW pIfRow);
 
 static HANDLE s_hDLL;
 static PFN_GetIpAddrTable s_pfnGetIpAddrTable;
 static PFN_GetIpForwardTable s_pfnGetIpForwardTable;
+static PFN_GetIfEntry s_pfnGetIfEntry;
 
 static void unload_iphlp_module(void)
@@ -84 +90 @@
     return ERROR_NOT_SUPPORTED;
 }
+
+
+#if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
+static DWORD MyGetIfEntry(MIB_IFROW *pIfRow)
+{
+    if(NULL == s_pfnGetIfEntry) {
+        s_pfnGetIfEntry = (PFN_GetIfEntry) 
+            GetIpHlpApiProc(PJ_T("GetIfEntry"));
+    }
+    
+    if(NULL != s_pfnGetIfEntry) {
+        return s_pfnGetIfEntry(pIfRow);
+    }
+    
+    return ERROR_NOT_SUPPORTED;
+}
+#endif
 
 
@@ -135 +158 @@
     *p_cnt = 0;
     for (i=0; i<count; ++i) {
+        MIB_IFROW ifRow;
+
         /* Some Windows returns 0.0.0.0! */
         if (pTab->table[i].dwAddr == 0)
             continue;
+
+#if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
+        /* Investigate the type of this interface */
+        pj_bzero(&ifRow, sizeof(ifRow));
+        ifRow.dwIndex = pTab->table[i].dwIndex;
+        if (MyGetIfEntry(&ifRow) != 0)
+            continue;
+
+        if (ifRow.dwType == MIB_IF_TYPE_LOOPBACK)
+            continue;
+#endif
+
         ifs[*p_cnt].s_addr = pTab->table[i].dwAddr;
         (*p_cnt)++;