Changeset 27848 in vbox for trunk/src

Timestamp:

Mar 31, 2010 3:42:56 AM (15 years ago)

Author:

vboxsync

Message:

NAT service: sync with changes in DrvNAT. NAT service is compilable and usable now.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• libslirp.h (modified) (1 diff)
• slirp.c (modified) (3 diffs)

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

@@ -32 +32 @@
 int slirp_init(PNATState *, const char *, uint32_t, bool, bool, void *);
 #else
-int slirp_init(PNATState *, uint32_t, uint32_t, bool, void *);
+int slirp_init(PNATState *, uint32_t, uint32_t, bool, bool, void *);
 #endif
 void slirp_register_statistics(PNATState pData, PPDMDRVINS pDrvIns);

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

@@ -517 +517 @@
 #else
 int slirp_init(PNATState *ppData, uint32_t u32NetAddr, uint32_t u32Netmask,
-               bool fPassDomain, void *pvUser)
+               bool fPassDomain, bool fUseHostResolver, void *pvUser)
 #endif
 {
@@ -640 +640 @@
 void slirp_deregister_statistics(PNATState pData, PPDMDRVINS pDrvIns)
 {
+    if (pData == NULL)
+        return;
 #ifdef VBOX_WITH_STATISTICS
 # define PROFILE_COUNTER(name, dsc)     DEREGISTER_COUNTER(name, pData)
@@ -701 +703 @@
 void slirp_term(PNATState pData)
 {
+    if (pData == NULL)
+        return; 
 #ifdef RT_OS_WINDOWS
     pData->pfIcmpCloseHandle(pData->icmp_socket.sh);