Changeset 53292 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Nov 10, 2014 3:03:43 PM (10 years ago)

Author:

vboxsync

Message:

NAT: Don't retrieve the address of GetAdaptersAddresses() in icmp_init().
While we, conveniently, do have iphlpapi.dll open there, it's not a good
reason to do this lookup of completely unrealted function there.
Do this in slirp_init() instead.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_icmp.c (modified) (1 diff)
• slirp.c (modified) (1 diff)

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

@@ -127 +127 @@
             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);
         }

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

@@ -336 +336 @@
     {
         WSADATA Data;
+        RTLDRMOD hLdrMod;
+
         WSAStartup(MAKEWORD(2, 0), &Data);
+
+        rc = RTLdrLoadSystem("Iphlpapi.dll", /* :fNoUnload */ true, &hLdrMod);
+        if (RT_SUCCESS(rc))
+        {
+            rc = RTLdrGetSymbol(hLdrMod, "GetAdaptersAddresses", (void **)&pData->pfGetAdaptersAddresses);
+            if (RT_FAILURE(rc))
+                LogRel(("NAT: Can't find GetAdapterAddresses in Iphlpapi.dll\n"));
+
+            RTLdrClose(hLdrMod);
+        }
     }
     pData->phEvents[VBOX_SOCKET_EVENT_INDEX] = CreateEvent(NULL, FALSE, FALSE, NULL);