Changeset 46593 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 17, 2013 2:32:51 PM (12 years ago)

Author:

vboxsync

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

86471

Message:

updates

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -57 +57 @@
 #include "ip_icmp.h"
 #ifdef RT_OS_WINDOWS
-#include <Icmpapi.h>
-#include <Iphlpapi.h>
+# include <Icmpapi.h>
+# include <Iphlpapi.h>
+# include <iprt/ldr.h>
 #endif
 
@@ -116 +117 @@
     fd_nonblock(pData->icmp_socket.s);
     NSOCK_INC();
+
 #else /* RT_OS_WINDOWS */
-    pData->hmIcmpLibrary = LoadLibrary("Iphlpapi.dll");
-    if (pData->hmIcmpLibrary != NULL)
-    {
-        pData->pfIcmpParseReplies = (long (WINAPI *)(void *, long))
-                                    GetProcAddress(pData->hmIcmpLibrary, "IcmpParseReplies");
-        pData->pfIcmpCloseHandle = (BOOL (WINAPI *)(HANDLE))
-                                    GetProcAddress(pData->hmIcmpLibrary, "IcmpCloseHandle");
-        pData->pfGetAdaptersAddresses = (ULONG (WINAPI *)(ULONG, ULONG, PVOID, PIP_ADAPTER_ADDRESSES, PULONG))
-                                    GetProcAddress(pData->hmIcmpLibrary, "GetAdaptersAddresses");
-        if (pData->pfGetAdaptersAddresses == NULL)
+    /* Resolve symbols we need. */
+    {
+        RTLDRMOD hLdrMod;
+        int rc = RTLdrLoadSystem("Iphlpapi.dll", true /*fNoUnload*/, &hLdrMod);
+        if (RT_SUCCESS(rc))
         {
-            LogRel(("NAT: Can't find GetAdapterAddresses in Iphlpapi.dll\n"));
+            pData->pfIcmpParseReplies = (long (WINAPI *)(void *, long))RTLdrGetFunction(hLdrMod, "IcmpParseReplies");
+            pData->pfIcmpCloseHandle = (BOOL (WINAPI *)(HANDLE))RTLdrGetFunction(hLdrMod, "IcmpCloseHandle");
+            rc = RTLdrGetSymbol(hLdrMod, "GetAdaptersAddresses", (void **)&pData->pfGetAdaptersAddresses);
+            if (RT_FAILURE(rc))
+                LogRel(("NAT: Can't find GetAdapterAddresses in Iphlpapi.dll\n"));
+            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)
     {
-        if(pData->pfGetAdaptersAddresses == NULL)
-            FreeLibrary(pData->hmIcmpLibrary);
-        pData->hmIcmpLibrary = LoadLibrary("Icmp.dll");
-        if (pData->hmIcmpLibrary == NULL)
-        {
-            LogRel(("NAT: Icmp.dll could not be loaded\n"));
-            return 1;
-        }
-        pData->pfIcmpParseReplies = (long (WINAPI *)(void *, long))
-                                    GetProcAddress(pData->hmIcmpLibrary, "IcmpParseReplies");
-        pData->pfIcmpCloseHandle = (BOOL (WINAPI *)(HANDLE))
-                                    GetProcAddress(pData->hmIcmpLibrary, "IcmpCloseHandle");
-    }
-    if (pData->pfIcmpParseReplies == NULL)
-    {
         LogRel(("NAT: Can't find IcmpParseReplies symbol\n"));
-        FreeLibrary(pData->hmIcmpLibrary);
         return 1;
     }
@@ -156 +154 @@
     {
         LogRel(("NAT: Can't find IcmpCloseHandle symbol\n"));
-        FreeLibrary(pData->hmIcmpLibrary);
         return 1;
     }
+
     pData->icmp_socket.sh = IcmpCreateFile();
     pData->phEvents[VBOX_ICMP_EVENT_INDEX] = CreateEvent(NULL, FALSE, FALSE, NULL);
-    pData->szIcmpBuffer = sizeof(ICMP_ECHO_REPLY) * 10;
-    pData->pvIcmpBuffer = RTMemAlloc(pData->szIcmpBuffer);
+    pData->cbIcmpBuffer = sizeof(ICMP_ECHO_REPLY) * 10;
+    pData->pvIcmpBuffer = RTMemAlloc(pData->cbIcmpBuffer);
 #endif /* RT_OS_WINDOWS */
+
     LIST_INIT(&pData->icmp_msg_head);
     return 0;
@@ -177 +176 @@
 #ifdef RT_OS_WINDOWS
     pData->pfIcmpCloseHandle(pData->icmp_socket.sh);
-    FreeLibrary(pData->hmIcmpLibrary);
     RTMemFree(pData->pvIcmpBuffer);
 #else
@@ -529 +527 @@
                                        &ipopt /*=RequestOptions*/,
                                        pData->pvIcmpBuffer /*=ReplyBuffer*/,
-                                       pData->szIcmpBuffer /*=ReplySize*/,
+                                       pData->cbIcmpBuffer /*=ReplySize*/,
                                        1 /*=Timeout in ms*/);
                 error = GetLastError();
@@ -710 +708 @@
     {
         /* DEBUG : append message to ICMP packet */
-        int message_len;
+        size_t message_len;
         message_len = strlen(message);
         if (message_len > ICMP_MAXDATALEN)
             message_len = ICMP_MAXDATALEN;
-        m_append(pData, m, message_len, message);
+        m_append(pData, m, (int)message_len, message);
     }
 #else

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

@@ -202 +202 @@
 # ifdef RT_OS_WINDOWS
     void *pvIcmpBuffer;
-    size_t szIcmpBuffer;
-    /* Accordin MSDN specification IcmpParseReplies
-     * function should be detected in runtime
+    uint32_t cbIcmpBuffer;
+    /* According MSDN specification IcmpParseReplies
+     * function should be detected at runtime.
      */
     long (WINAPI * pfIcmpParseReplies)(void *, long);
     BOOL (WINAPI * pfIcmpCloseHandle)(HANDLE);
-    HMODULE hmIcmpLibrary;
 # endif
 #if defined(RT_OS_WINDOWS)

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

@@ -1479 +1479 @@
     int size;
 
-    len = pData->pfIcmpParseReplies(pData->pvIcmpBuffer, pData->szIcmpBuffer);
+    len = pData->pfIcmpParseReplies(pData->pvIcmpBuffer, pData->cbIcmpBuffer);
     if (len < 0)
     {