Changeset 20379 in vbox

Timestamp:

Jun 8, 2009 6:43:48 AM (16 years ago)

Author:

vboxsync

Message:

NAT: introduce slirp's interface to configure socket's and sbuf defaults

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (2 diffs)
• slirp_state.h (modified) (2 diffs)
• socket.c (modified) (2 diffs)
• tcp_subr.c (modified) (2 diffs)

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

@@ -632 +632 @@
     pData->pvUser = pvUser;
     pData->netmask = u32Netmask;
+
+    /* sockets & TCP defaults */
+    pData->socket_rcv = 64 * _1K;
+    pData->socket_snd = 64 * _1K;
+    tcp_sndspace = 64 * _1K;
+    tcp_rcvspace = 64 * _1K;
 
 #ifdef RT_OS_WINDOWS
@@ -1845 +1851 @@
 }
 #endif
+
+#define CHECK_ARG(name, val, lim_min, lim_max)                                  \
+do {                                                                            \
+    if ((val) < (lim_min) || (val) > (lim_max))                                 \
+    {                                                                           \
+        LogRel(("NAT: (" #name ":%d) has been ignored, "                        \
+            "because out of range (%d, %d)\n", (val), (lim_min), (lim_max)));   \
+        return;                                                                 \
+    }                                                                           \
+    else                                                                        \
+    {                                                                           \
+        LogRel(("NAT: (" #name ":%d)\n", (val)));                               \
+    }                                                                           \
+} while (0)
+
+/* don't allow user set negative and more than 1M values */
+#define _1M_CHECK_ARG(name, val) CHECK_ARG(name, (val), 0, 1024)
+void slirp_set_rcvbuf(PNATState pData, int kilobytes)
+{
+    _1M_CHECK_ARG("SOCKET_RCVBUF", kilobytes);    
+    pData->socket_rcv = kilobytes;
+}
+void slirp_set_sndbuf(PNATState pData, int kilobytes)
+{
+    _1M_CHECK_ARG("SOCKET_SNDBUF", kilobytes);    
+    pData->socket_snd = kilobytes * _1K;
+}
+void slirp_set_tcp_rcvspace(PNATState pData, int kilobytes)
+{
+    _1M_CHECK_ARG("TCP_RCVSPACE", kilobytes);    
+    tcp_rcvspace = kilobytes * _1K;
+}
+void slirp_set_tcp_sndspace(PNATState pData, int kilobytes)
+{
+    _1M_CHECK_ARG("TCP_SNDSPACE", kilobytes);    
+    tcp_sndspace = kilobytes * _1K;
+}

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

@@ -114 +114 @@
     struct in_addr alias_addr;
     struct in_addr special_addr;
+
+    int tcp_rcvspace;
+    int tcp_sndspace;
+    int socket_rcv;
+    int socket_snd;
 #ifdef VBOX_WITH_SLIRP_MT
     PRTREQQUEUE pReqQueue;
@@ -271 +276 @@
 
 /** TCP receive buffer size. */
-#define tcp_rcvspace TCP_RCVSPACE
+#define tcp_rcvspace pData->tcp_rcvspace
 
 /** TCP receive buffer size. */
-#define tcp_sndspace TCP_SNDSPACE
+#define tcp_sndspace pData->tcp_sndspace
 
 /* TCP duplicate ACK retransmit threshold. */

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

@@ -825 +825 @@
     so->so_fport = addr.sin_port;
     /* set socket buffers */
-    opt = 64 * _1K;
+    opt = pData->socket_rcv;
     status = setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&opt, sizeof(int));
     if (status < 0)
@@ -832 +832 @@
         goto no_sockopt;
     }
-    opt = 64 * _1K;
+    opt = pData->socket_snd;
     status = setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&opt, sizeof(int));
     if (status < 0)

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

@@ -519 +519 @@
         LogRel(("NAT: old socket rcv size: %dKB\n", opt / 1024));
     /* @todo (r-vvl) make it configurable (via extra data) */
-    opt = 64 * _1K;
+    opt = pData->socket_rcv;
     status = setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&opt, sizeof(int));
     if (status < 0)
@@ -535 +535 @@
     if (cVerbose > 0)
         LogRel(("NAT: old socket snd size: %dKB\n", opt / 1024));
-    opt = 64 * _1K;
+    opt = pData->socket_rcv;
     status = setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&opt, sizeof(int));
     if (status < 0)