Changeset 38971 in vbox

Timestamp:

Oct 10, 2011 8:28:30 AM (13 years ago)

Author:

vboxsync

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

74342

Message:

NAT: configuration of limit of ICMP cache and moving icmp finilization and other ICMP's resources to icmp_finit routine.

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (3 diffs)
• slirp/ip_icmp.c (modified) (2 diffs)
• slirp/ip_icmp.h (modified) (1 diff)
• slirp/libslirp.h (modified) (1 diff)
• slirp/slirp.c (modified) (3 diffs)

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -1158 +1158 @@
                               "SlirpMTU\0AliasMode\0"
                               "SockRcv\0SockSnd\0TcpRcv\0TcpSnd\0"
+                              "ICMPCacheLimit\0"
                               "SoMaxConnection\0"))
         return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
@@ -1211 +1212 @@
     int i32MainAliasMode = 0;
     GET_S32(rc, pThis, pCfg, "AliasMode", i32MainAliasMode);
+    int iIcmpCacheLimit = 100;
+    GET_S32(rc, pThis, pCfg, "ICMPCacheLimit", iIcmpCacheLimit);
 
     i32AliasMode |= (i32MainAliasMode & 0x1 ? 0x1 : 0);
@@ -1251 +1254 @@
      */
     rc = slirp_init(&pThis->pNATState, RT_H2N_U32(Network), Netmask,
-                    fPassDomain, !!fUseHostResolver, i32AliasMode, pThis);
+                    fPassDomain, !!fUseHostResolver, i32AliasMode,
+                    iIcmpCacheLimit, pThis);
     if (RT_SUCCESS(rc))
     {

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

@@ -89 +89 @@
 };
 
-static int icmp_cache_count(PNATState pData);
 static void icmp_cache_clean(PNATState pData, int iEntries);
 
 int
-icmp_init(PNATState pData)
+icmp_init(PNATState pData, int iIcmpCacheLimit)
 {
     pData->icmp_socket.so_type = IPPROTO_ICMP;
     pData->icmp_socket.so_state = SS_ISFCONNECTED;
-    pData->iIcmpCacheLimit = 100;
+    if (iIcmpCacheLimit < 0)
+    {
+        LogRel(("NAT: iIcmpCacheLimit is invalid %d, will be alter to default value 100\n", iIcmpCacheLimit));
+        iIcmpCacheLimit = 100;
+    }
+    pData->iIcmpCacheLimit = iIcmpCacheLimit;
 #ifndef RT_OS_WINDOWS
 # ifndef RT_OS_DARWIN
@@ -162 +166 @@
     LIST_INIT(&pData->icmp_msg_head);
     return 0;
+}
+
+/**
+ * Cleans ICMP cache.
+ */
+int
+icmp_finit(PNATState pData)
+{
+    icmp_cache_clean(pData, -1);
+#ifdef RT_OS_WINDOWS
+    pData->pfIcmpCloseHandle(pData->icmp_socket.sh);
+    FreeLibrary(pData->hmIcmpLibrary);
+    RTMemFree(pData->pvIcmpBuffer);
+#else
+    closesocket(pData->icmp_socket.s);
+#endif
 }
 

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

@@ -199 +199 @@
 LIST_HEAD(icmp_storage, icmp_msg);
 
-int icmp_init (PNATState );
+int icmp_init (PNATState , int);
+int icmp_finit (PNATState );
 struct icmp_msg * icmp_find_original_mbuf (PNATState , struct ip *);
 

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

@@ -47 +47 @@
 #endif
 
-int slirp_init(PNATState *, uint32_t, uint32_t, bool, bool, int, void *);
+int slirp_init(PNATState *, uint32_t, uint32_t, bool, bool, int, int, void *);
 void slirp_register_statistics(PNATState pData, PPDMDRVINS pDrvIns);
 void slirp_deregister_statistics(PNATState pData, PPDMDRVINS pDrvIns);

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

@@ -584 +584 @@
 
 int slirp_init(PNATState *ppData, uint32_t u32NetAddr, uint32_t u32Netmask,
-               bool fPassDomain, bool fUseHostResolver, int i32AliasMode, void *pvUser)
+               bool fPassDomain, bool fUseHostResolver, int i32AliasMode,
+               int iIcmpCacheLimit, void *pvUser)
 {
     int fNATfailed = 0;
@@ -635 +636 @@
     if_init(pData);
     ip_init(pData);
-    icmp_init(pData);
+    icmp_init(pData, iIcmpCacheLimit);
 
     /* Initialise mbufs *after* setting the MTU */
@@ -772 +773 @@
     if (pData == NULL)
         return;
-#ifdef RT_OS_WINDOWS
-    pData->pfIcmpCloseHandle(pData->icmp_socket.sh);
-    FreeLibrary(pData->hmIcmpLibrary);
-    RTMemFree(pData->pvIcmpBuffer);
-#else
-    closesocket(pData->icmp_socket.s);
-#endif
+    icmp_finit(pData);
 
     slirp_link_down(pData);