Changeset 23004 in vbox

Timestamp:

Sep 14, 2009 2:03:27 PM (15 years ago)

Author:

vboxsync

Message:

NAT: 1. don't load ioctlsocket with unintiolized values (SL fills it with garbage).

2. don't limit icmp with 1500 bytes, check bytes ready for read before.

File:

• trunk/src/VBox/Devices/Network/slirp/socket.c (modified) (4 diffs)

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

@@ -564 +564 @@
         struct ethhdr *eh;
         ssize_t len;
-        u_long n;
+        u_long n = 0;
 #ifdef VBOX_WITH_SLIRP_BSD_MBUF
         uint8_t *buffer;
@@ -589 +589 @@
         /* if (so->so_fport != htons(53)) */
         {
-            ioctlsocket(so->s, FIONREAD, &n);
-
-            if (n > len)
+            static int signaled = 0;
+            int rc = ioctlsocket(so->s, FIONREAD, &n);
+            
+            if (rc == -1 && signaled == 0)
+            {
+                LogRel(("NAT: can't fetch amount of bytes on socket %R[natsock], so message will be truncated.\n", so));
+                signaled = 1;
+            } 
+
+            if (rc > 0 && n > len)
             {
                 n = (m->m_data - m->m_dat) + m->m_len + n + 1;
@@ -1210 +1217 @@
     struct sockaddr_in addr;
     socklen_t addrlen = sizeof(struct sockaddr_in);
-    char buff[1500];
-    int len;
-    len = recvfrom(so->s, buff, 1500, 0,
+    char *buff;
+    int len = 0;
+    int rc = 0;
+    static int signalled = 0;
+    rc = ioctlsocket(so->s, FIONREAD, &len);
+    if (rc != -1 && signalled == 0)
+    {
+        signalled = 1;
+        LogRel(("NAT: fetching number of bits has been failed for ICMP socket \n"));
+    }
+    len = (len != 0 && rc != -1 ? len : 1500);
+    buff = RTMemAlloc(len);
+    len = recvfrom(so->s, buff, len, 0,
                    (struct sockaddr *)&addr, &addrlen);
     /* XXX Check if reply is "correct"? */
@@ -1234 +1251 @@
         send_icmp_to_guest(pData, buff, len, so, &addr);
     }
+    RTMemFree(buff);
 }
 #endif /* !RT_OS_WINDOWS */