Changeset 39465 in vbox

Timestamp:

Nov 30, 2011 1:17:13 AM (13 years ago)

Author:

vboxsync

Message:

NAT: fixed typo (thanks Knut). This changeset adds comment to assignment in slirp_init and changes value really
providing default value for pData->soConnMax. slirp_set_somaxconn release log messages are prefixed with "NAT:" and
shows values changing.

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (1 diff)
• slirp/slirp.c (modified) (2 diffs)

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

@@ -1218 +1218 @@
     i32AliasMode |= (i32MainAliasMode & 0x2 ? 0x40 : 0);
     i32AliasMode |= (i32MainAliasMode & 0x4 ? 0x4 : 0);
-    int i32SoMaxConn = 1;
+    int i32SoMaxConn = 10;
     GET_S32(rc, pThis, pCfg, "SoMaxConnection", i32SoMaxConn);
     /*

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

@@ -605 +605 @@
     tcp_sndspace = 64 * _1K;
     tcp_rcvspace = 64 * _1K;
+    /**
+     * Assignment here has only meaning, to avoid additional noise in release log
+     * the value set from DrvNAT in function slirp_set_somaxcon, reading CFGM key
+     * "VBoxInternal/Devices/<adapter name>/0/LUN#0/Config/SoMaxConnection" or setting
+     * default value 10 (xTracker/5983) in case value for the key wasn't found.
+     */
     pData->soMaxConn = 10;
 
@@ -2012 +2018 @@
     if (iSoMaxConn > SOMAXCONN)
     {
-        LogRel(("New value of somaxconn(%d) bigger than SOMAXCONN(%d)\n", iSoMaxConn, SOMAXCONN));
+        LogRel(("NAT: value of somaxconn(%d) bigger than SOMAXCONN(%d)\n", iSoMaxConn, SOMAXCONN));
         iSoMaxConn = SOMAXCONN;
     }
-    pData->soMaxConn = iSoMaxConn > 0 ? iSoMaxConn : pData->soMaxConn;
-    if (pData->soMaxConn > 1)
-        LogRel(("New value of somaxconn: %d\n", pData->soMaxConn));
+    if (pData->soMaxConn != iSoMaxConn)
+    {
+        LogRel(("NAT: value of somaxconn has been changed from %d to %d\n",
+                pData->soMaxConn, iSoMaxConn));
+        pData->soMaxConn = iSoMaxConn;
+    }
     LogFlowFuncLeave();
 }