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

Timestamp:

Dec 8, 2008 3:23:40 PM (16 years ago)

Author:

vboxsync

Message:

Dynamic detection of IcmpParceReplies function according MSDN recommendation was introduced

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_icmp.c (modified) (3 diffs)
• slirp_state.h (modified) (1 diff)
• socket.c (modified) (2 diffs)

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

@@ -81 +81 @@
     insque(pData, &pData->icmp_socket, &udb);
 #else
+    pData->hmIcmpLibrary = LoadLibrary("Iphlpapi.dll");
+    if (pData->hmIcmpLibrary != NULL) {
+            pData->pfIcmpParseReplies = (long (WINAPI *)(void *, long))GetProcAddress(pData->hmIcmpLibrary, "IcmpParseReplies");
+    }
+    if (pData->pfIcmpParseReplies == NULL) {
+            FreeLibrary(pData->hmIcmpLibrary);
+            pData->hmIcmpLibrary = LoadLibrary("Icmp.dll");
+            if (pData->hmIcmpLibrary == NULL) {
+                    LogRel(("Icmp.dll couldn't be loaded"));
+                    return (1);
+            }
+            pData->pfIcmpParseReplies = (long (WINAPI *)(void *, long))GetProcAddress(pData->hmIcmpLibrary, "IcmpParseReplies");
+    }
+    if (pData->pfIcmpParseReplies == NULL) {
+            LogRel(("Can't find IcmpParseReplies symbol"));
+            FreeLibrary(pData->hmIcmpLibrary);
+            return (1);
+    } 
     pData->icmp_socket.s = IcmpCreateFile();
     pData->phEvents[VBOX_ICMP_EVENT_INDEX] = CreateEvent(NULL, FALSE, FALSE, NULL);
@@ -130 +148 @@
     }
     if (found == 1)
-        return cm;
+        return icm;
 
     return NULL;
@@ -301 +319 @@
                 ipopt.Ttl = ip->ip_ttl;
                 status = IcmpSendEcho2(pData->icmp_socket.s, pData->phEvents[VBOX_ICMP_EVENT_INDEX],
-                                       NULL, NULL, addr.sin_addr.s_addr, icp, icmplen, &ipopt,
+                                       NULL, NULL, addr.sin_addr.s_addr, icp->icmp_data, icmplen - offsetof(struct icmp, icmp_data) , &ipopt,
                                        pData->pvIcmpBuffer, pData->szIcmpBuffer, 10);
                 if (status == 0 && (error = GetLastError()) != ERROR_IO_PENDING)

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

@@ -140 +140 @@
     void *pvIcmpBuffer;
     size_t szIcmpBuffer;
+    /* Accordin MSDN specification IcmpParseReplies 
+     * function should be detected in runtime
+     */
+    long (WINAPI * pfIcmpParseReplies)(void *, long);
+    HMODULE hmIcmpLibrary;
 #endif
 #endif

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

@@ -14 +14 @@
 #endif
 #if defined(VBOX_WITH_SLIRP_ICMP) && defined (RT_OS_WINDOWS) 
+#include <iphlpapi.h>
 #include <icmpapi.h>
 #endif
@@ -843 +844 @@
         ICMP_ECHO_REPLY *icr;
         u_char code = ~0;
-        len = IcmpParseReplies(pData->pvIcmpBuffer, pData->szIcmpBuffer);
+        len = pData->pfIcmpParseReplies(pData->pvIcmpBuffer, pData->szIcmpBuffer);
         if (len <= 0) {
               LogRel(("Error (%d) occured on ICMP receiving \n", GetLastError()));