Changeset 23426 in vbox

Timestamp:

Sep 30, 2009 7:56:52 AM (16 years ago)

Author:

vboxsync

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

53005

Message:

NAT: removes extra inclusion.

File:

• trunk/src/VBox/Devices/Network/slirp/socket.c (modified) (1 diff)

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

@@ -597 +597 @@
         len = M_FREEROOM(m);
         /* if (so->so_fport != htons(53)) */
-        {
-            rc = ioctlsocket(so->s, FIONREAD, &n);
-            if (   rc == -1
-                && (  errno == EAGAIN
-                   || errno == EWOULDBLOCK
-                   || errno == EINPROGRESS
-                   || errno == ENOTCONN))
-            {
-                m_free(pData, m);
-                return;
-            }
-
-            Log2(("NAT: %R[natsock] ioctlsocket before read "
-                "(rc:%d errno:%d, n:%d)\n", so, rc, errno, n));
-
-            if (rc == -1 && signalled == 0)
-            {
-                LogRel(("NAT: can't fetch amount of bytes on socket %R[natsock], so message will be truncated.\n", so));
-                signalled = 1;
-                m_free(pData, m);
-                return;
-            }
-
-            if (rc != -1 && n > len)
-            {
-                n = (m->m_data - m->m_dat) + m->m_len + n + 1;
-                m_inc(m, n);
-                len = M_FREEROOM(m);
-            }
+        rc = ioctlsocket(so->s, FIONREAD, &n);
+        if (   rc == -1
+            && (  errno == EAGAIN
+               || errno == EWOULDBLOCK
+               || errno == EINPROGRESS
+               || errno == ENOTCONN))
+        {
+            m_free(pData, m);
+            return;
+        }
+
+        Log2(("NAT: %R[natsock] ioctlsocket before read "
+            "(rc:%d errno:%d, n:%d)\n", so, rc, errno, n));
+
+        if (rc == -1 && signalled == 0)
+        {
+            LogRel(("NAT: can't fetch amount of bytes on socket %R[natsock], so message will be truncated.\n", so));
+            signalled = 1;
+            m_free(pData, m);
+            return;
+        }
+
+        if (rc != -1 && n > len)
+        {
+            n = (m->m_data - m->m_dat) + m->m_len + n + 1;
+            m_inc(m, n);
+            len = M_FREEROOM(m);
         }
         ret = recvfrom(so->s, m->m_data, len, 0,