Changeset 53298 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Nov 11, 2014 4:51:45 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96877

Message:

NAT: Start untangling Windows ICMP API code out of ip_icmp.c.
Add new file ip_icmpwin.c and move icmp init/fini into it as-is.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_icmp.c (modified) (2 diffs)
• ip_icmp.h (modified) (1 diff)
• ip_icmpwin.c (added)

trunk/src/VBox/Devices/Network/slirp/ip_icmp.c

@@ -119 +119 @@
 
 #else /* RT_OS_WINDOWS */
-    /* Resolve symbols we need. */
-    {
-        RTLDRMOD hLdrMod;
-        int rc = RTLdrLoadSystem("Iphlpapi.dll", true /*fNoUnload*/, &hLdrMod);
-        if (RT_SUCCESS(rc))
-        {
-            pData->pfIcmpParseReplies = (long (WINAPI *)(void *, long))RTLdrGetFunction(hLdrMod, "IcmpParseReplies");
-            pData->pfIcmpCloseHandle = (BOOL (WINAPI *)(HANDLE))RTLdrGetFunction(hLdrMod, "IcmpCloseHandle");
-            RTLdrClose(hLdrMod);
-        }
-
-        if (pData->pfIcmpParseReplies == NULL)
-        {
-            int rc = RTLdrLoadSystem("Icmp.dll", true /*fNoUnload*/, &hLdrMod);
-            if (RT_FAILURE(rc))
-            {
-                LogRel(("NAT: Icmp.dll could not be loaded: %Rrc\n", rc));
-                return 1;
-            }
-            pData->pfIcmpParseReplies = (long (WINAPI *)(void *, long))RTLdrGetFunction(hLdrMod, "IcmpParseReplies");
-            pData->pfIcmpCloseHandle = (BOOL (WINAPI *)(HANDLE))RTLdrGetFunction(hLdrMod, "IcmpCloseHandle");
-            RTLdrClose(hLdrMod);
-        }
-    }
-    if (pData->pfIcmpParseReplies == NULL)
-    {
-        LogRel(("NAT: Can't find IcmpParseReplies symbol\n"));
+    if (icmpwin_init(pData) != 0)
         return 1;
-    }
-    if (pData->pfIcmpCloseHandle == NULL)
-    {
-        LogRel(("NAT: Can't find IcmpCloseHandle symbol\n"));
-        return 1;
-    }
-
-    pData->icmp_socket.sh = IcmpCreateFile();
-    pData->phEvents[VBOX_ICMP_EVENT_INDEX] = CreateEvent(NULL, FALSE, FALSE, NULL);
-    pData->cbIcmpBuffer = sizeof(ICMP_ECHO_REPLY) * 10;
-    pData->pvIcmpBuffer = RTMemAlloc(pData->cbIcmpBuffer);
 #endif /* RT_OS_WINDOWS */
 
@@ -172 +135 @@
     icmp_cache_clean(pData, -1);
 #ifdef RT_OS_WINDOWS
-    pData->pfIcmpCloseHandle(pData->icmp_socket.sh);
-    RTMemFree(pData->pvIcmpBuffer);
+    icmpwin_finit(pData);
 #else
     closesocket(pData->icmp_socket.s);

trunk/src/VBox/Devices/Network/slirp/ip_icmp.h

@@ -203 +203 @@
 struct icmp_msg * icmp_find_original_mbuf (PNATState , struct ip *);
 
+#ifdef RT_OS_WINDOWS
+/* Windows ICMP API code in ip_icmpwin.c */
+int icmpwin_init (PNATState);
+void icmpwin_finit (PNATState);
 #endif
+
+#endif