Changeset 43233 in vbox

Timestamp:

Sep 6, 2012 8:21:37 PM (12 years ago)

Author:

vboxsync

Message:

NAT: destroy really all memory in drvNATDestruct

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• misc.c (modified) (2 diffs)
• slirp.c (modified) (1 diff)
• tftp.c (modified) (2 diffs)
• tftp.h (modified) (1 diff)

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

@@ -538 +538 @@
     LogFlowFunc(("ENTER: zone:%R[mzone]\n", zone));
     LogRel(("NAT: zone(nm:%s, used:%d)\n", zone->name, zone->cur_items));
-    if (zone->master_zone)
-        RTMemFree(zone->area);
+    RTMemFree(zone->area);
     RTCritSectLeave(&zone->csZone);
     RTCritSectDelete(&zone->csZone);
@@ -556 +555 @@
     ZONE_DESTROY(pData->zone_jumbo9);
     ZONE_DESTROY(pData->zone_jumbo16);
+    ZONE_DESTROY(pData->zone_ext_refcnt);
 # undef ZONE_DESTROY
     /** @todo do finalize here.*/

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

@@ -525 +525 @@
         RTMemFree(ac);
     }
+    slirpTftpTerm(pData);
     bootp_dhcp_fini(pData);
     m_fini(pData);

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

@@ -762 +762 @@
 }
 
-DECLCALLBACK(int) slirpTftpInit(PNATState pData)
+int slirpTftpInit(PNATState pData)
 {
     AssertPtrReturn(pData, VERR_INVALID_PARAMETER);
@@ -770 +770 @@
 }
 
-DECLCALLBACK(int) slirpTftpInput(PNATState pData, struct mbuf *pMbuf)
+void slirpTftpTerm(PNATState pData)
+{
+    RTMemFree(pData->pvTftpSessions);
+}
+
+int slirpTftpInput(PNATState pData, struct mbuf *pMbuf)
 {
     PTFTPIPHDR pTftpIpHeader = NULL;

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

@@ -35 +35 @@
 
 
-int slirpTftpInput(PNATState pData, struct mbuf *m);
-int slirpTftpInit(PNATState);
+int  slirpTftpInput(PNATState pData, struct mbuf *m);
+int  slirpTftpInit(PNATState pData);
+void slirpTftpTerm(PNATState pData);
 #endif