Changeset 23163 in vbox for trunk

Timestamp:

Sep 20, 2009 12:47:53 PM (15 years ago)

Author:

vboxsync

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

52580

Message:

NAT: introduces SlirpMTU extradata-parameter for altering slirp's mtu.

Location:

trunk/src/VBox/Devices/Network

Files:

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

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

@@ -806 +806 @@
                               "PassDomain\0TFTPPrefix\0BootFile\0Network"
                               "\0NextServer\0DNSProxy\0BindIP\0UseHostResolver\0"
+#ifdef VBOX_WITH_SLIRP_BSD_MBUF
+                              "SlirpMTU\0"
+#endif
                               "SocketRcvBuf\0SocketSndBuf\0TcpRcvSpace\0TcpSndSpace\0"))
         return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
@@ -841 +844 @@
     int fUseHostResolver = 0;
     GET_S32(rc, pThis, pCfgHandle, "UseHostResolver", fUseHostResolver);
+#ifdef VBOX_WITH_SLIRP_BSD_MBUF
+    int MTU = 1500;
+    GET_S32(rc, pThis, pCfgHandle, "SlirpMTU", MTU);
+#endif
 
     /*
@@ -889 +896 @@
         slirp_set_dhcp_next_server(pThis->pNATState, pThis->pszNextServer);
         slirp_set_dhcp_dns_proxy(pThis->pNATState, !!fDNSProxy);
+#ifdef VBOX_WITH_SLIRP_BSD_MBUF
+        slirp_set_mtu(pThis->pNATState, MTU);
+#endif
         char *pszBindIP = NULL;
         GET_STRING_ALLOC(rc, pThis, pCfgHandle, "BindIP", pszBindIP);

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

@@ -36 +36 @@
     if_thresh = 10;
     if_comp = IF_AUTOCOMP;
-#ifndef VBOX_WITH_SLIRP_BSD_MBUF
     if_mtu = 1500;
     if_mru = 1500;
+#ifndef VBOX_WITH_SLIRP_BSD_MBUF
     if_fastq.ifq_next = if_fastq.ifq_prev = &if_fastq;
     if_batchq.ifq_next = if_batchq.ifq_prev = &if_batchq;
@@ -44 +44 @@
     next_m = &if_batchq;
 #else
-    if_mtu = 1500;
-    if_mru = 1500;
     TAILQ_INIT(&if_fastq);
     TAILQ_INIT(&if_batchq);

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

@@ -72 +72 @@
 
 int slirp_set_binding_address(PNATState, char *addr);
+#ifdef VBOX_WITH_SLIRP_BSD_MBUF
+void slirp_set_mtu(PNATState, int);
+#endif
 
 #if defined(RT_OS_WINDOWS)

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

@@ -2063 +2063 @@
     LIST_INSERT_HEAD(&pData->arp_cache, ac, list);
 }
+
+#ifdef VBOX_WITH_SLIRP_BSD_MBUF
+void slirp_set_mtu(PNATState pData, int mtu)
+{
+    if (mtu < 20 || mtu >= 16000)
+    {
+        LogRel(("NAT: mtu(%d) is out of range (20;16000] mtu forcely assigned to 1500\n", mtu));
+        mtu = 1500;
+    }
+    if_mtu = 
+    if_mru = mtu;
+}
+#endif
+void slirp_set_dhcp_mtu(PNATState, int);