Changeset 38968 in vbox

Timestamp:

Oct 10, 2011 2:27:41 AM (13 years ago)

Author:

vboxsync

Message:

NAT: replacement of in-place icmp depth calculation with reference counting.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -97 +97 @@
     pData->icmp_socket.so_type = IPPROTO_ICMP;
     pData->icmp_socket.so_state = SS_ISFCONNECTED;
+    pData->iIcmpCacheLimit = 100;
 #ifndef RT_OS_WINDOWS
 # ifndef RT_OS_DARWIN
@@ -298 +299 @@
          */
         LIST_INSERT_HEAD(&pData->icmp_msg_head, icm, im_list);
+        pData->cIcmpCacheSize++;
+        if (pData->cIcmpCacheSize > pData->iIcmpCacheLimit)
+            icmp_cache_clean(pData, pData->iIcmpCacheLimit/2);
         LogFlowFunc(("LEAVE: icm:%p\n", icm));
         return (icm);
@@ -311 +315 @@
 }
 
-static int icmp_cache_count(PNATState pData)
-{
-    int iIcmpCount = 0;
-    struct icmp_msg *icm = NULL;
-    LogFlowFuncEnter();
-    LIST_FOREACH(icm, &pData->icmp_msg_head, im_list)
-        iIcmpCount++;
-    LogFlowFunc(("LEAVE: %d\n", iIcmpCount));
-    return iIcmpCount;
-}
 /**
  * iEntries how many entries to leave, if iEntries < 0, clean all
@@ -329 +323 @@
     struct icmp_msg *icm = NULL;
     LogFlowFunc(("iEntries:%d\n", iEntries));
-    if (iEntries > icmp_cache_count(pData))
+    if (iEntries > pData->cIcmpCacheSize)
     {
         LogFlowFuncLeave();
@@ -346 +340 @@
         LIST_REMOVE(icm, im_list);
         if (icm->im_m)
+        {
+            pData->cIcmpCacheSize--;
             m_freem(pData, icm->im_m);
+        }
         RTMemFree(icm);
     }
@@ -363 +360 @@
     icm->im_so = m->m_so;
     LIST_INSERT_HEAD(&pData->icmp_msg_head, icm, im_list);
-    if (icmp_cache_count(pData) > 100)
-        icmp_cache_clean(pData, 50);
+    pData->cIcmpCacheSize++;
+    if (pData->cIcmpCacheSize > pData->iIcmpCacheLimit)
+        icmp_cache_clean(pData, pData->iIcmpCacheLimit/2);
     return 0;
 }

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

@@ -198 +198 @@
 #  define NSOCK_DEC_EX(ex) do {} while (0)
 # endif
+    int cIcmpCacheSize;
+    int iIcmpCacheLimit;
 # ifdef RT_OS_WINDOWS
     void *pvIcmpBuffer;

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

@@ -1316 +1316 @@
     icmp_reflect(pData, m);
     LIST_REMOVE(icm, im_list);
+    pData->cIcmpCacheSize--;
     /* Don't call m_free here*/
 
@@ -1428 +1429 @@
                     m_freem(pData, icm->im_m);
                     LIST_REMOVE(icm, im_list);
+                    pData->cIcmpCacheSize--;
                     RTMemFree(icm);
                 }
@@ -1477 +1479 @@
                 /* Here is different situation from Unix world, where we can receive icmp in response on TCP/UDP */
                 LIST_REMOVE(icm, im_list);
+                pData->cIcmpCacheSize--;
                 RTMemFree(icm);
                 break;