Changeset 38111 in vbox

Timestamp:

Jul 22, 2011 6:05:36 AM (13 years ago)

Author:

vboxsync

Message:

NAT: makes backlog value configurable in listen(, backlog).

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (6 diffs)
• slirp/libslirp.h (modified) (1 diff)
• slirp/slirp.c (modified) (2 diffs)
• slirp/slirp_state.h (modified) (1 diff)
• slirp/socket.c (modified) (1 diff)

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

@@ -298 +298 @@
     STAM_PROFILE_START(&pThis->StatNATRecv, a);
 
-    STAM_PROFILE_START(&pThis->StatNATRecvWait, b);
 
     while (ASMAtomicReadU32(&pThis->cUrgPkts) != 0)
@@ -312 +311 @@
     AssertRC(rc);
 
+    STAM_PROFILE_START(&pThis->StatNATRecvWait, b);
     rc = pThis->pIAboveNet->pfnWaitReceiveAvail(pThis->pIAboveNet, RT_INDEFINITE_WAIT);
+    STAM_PROFILE_STOP(&pThis->StatNATRecvWait, b);
+
     if (RT_SUCCESS(rc))
     {
@@ -333 +335 @@
     drvNATNotifyNATThread(pThis, "drvNATRecvWorker");
 
-    STAM_PROFILE_STOP(&pThis->StatNATRecvWait, b);
     STAM_PROFILE_STOP(&pThis->StatNATRecv, a);
 }
@@ -1156 +1157 @@
                               "\0NextServer\0DNSProxy\0BindIP\0UseHostResolver\0"
                               "SlirpMTU\0AliasMode\0"
-                              "SockRcv\0SockSnd\0TcpRcv\0TcpSnd\0"))
+                              "SockRcv\0SockSnd\0TcpRcv\0TcpSnd\0"
+                              "SoMaxConnection\0"))
         return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
                                 N_("Unknown NAT configuration option, only supports PassDomain,"
@@ -1213 +1215 @@
     i32AliasMode |= (i32MainAliasMode & 0x2 ? 0x40 : 0);
     i32AliasMode |= (i32MainAliasMode & 0x4 ? 0x4 : 0);
+    int i32SoMaxConn = 1;
+    GET_S32(rc, pThis, pCfg, "SoMaxConnection", i32SoMaxConn);
     /*
      * Query the network port interface.
@@ -1255 +1259 @@
         slirp_set_dhcp_dns_proxy(pThis->pNATState, !!fDNSProxy);
         slirp_set_mtu(pThis->pNATState, MTU);
+        slirp_set_somaxconn(pThis->pNATState, i32SoMaxConn);
         char *pszBindIP = NULL;
         GET_STRING_ALLOC(rc, pThis, pCfg, "BindIP", pszBindIP);

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

@@ -95 +95 @@
 void slirp_set_mtu(PNATState, int);
 void slirp_info(PNATState pData, PCDBGFINFOHLP pHlp, const char *pszArgs);
+void slirp_set_somaxconn(PNATState pData, int iSoMaxConn);
 
 #if defined(RT_OS_WINDOWS)

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

@@ -606 +606 @@
     tcp_sndspace = 64 * _1K;
     tcp_rcvspace = 64 * _1K;
+    pData->soMaxConn = 1; /* historical value */
 
 #ifdef RT_OS_WINDOWS
@@ -2002 +2003 @@
     } while (0)
 
+void slirp_set_somaxconn(PNATState pData, int iSoMaxConn)
+{
+    LogFlowFunc(("iSoMaxConn:d\n", iSoMaxConn));
+    if (iSoMaxConn > SOMAXCONN)
+    {
+        LogRel(("New value of somaxconn(%d) bigger than SOMAXCONN(%d)\n", iSoMaxConn, SOMAXCONN));
+        pData->soMaxConn = SOMAXCONN;
+    }
+    pData->soMaxConn = iSoMaxConn > 0 ? iSoMaxConn : pData->soMaxConn;
+    LogRel(("New value of somaxconn: %d\n", pData->soMaxConn));
+    LogFlowFuncLeave();
+}
 /* don't allow user set less 8kB and more than 1M values */
 #define _8K_1M_CHECK_ARG(name, val) CHECK_ARG(name, (val), 8, 1024)

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

@@ -134 +134 @@
     int socket_rcv;
     int socket_snd;
+    int soMaxConn;
 #ifdef VBOX_WITH_SLIRP_MT
     PRTREQQUEUE pReqQueue;

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

@@ -1025 +1025 @@
         || (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,(char *)&opt, sizeof(int)) < 0)
         || (bind(s,(struct sockaddr *)&addr, sizeof(addr)) < 0)
-        || (listen(s, SOMAXCONN) < 0))
+        || (listen(s, pData->soMaxConn) < 0))
     {
 #ifdef RT_OS_WINDOWS