Changeset 23178 in vbox for trunk/src

Timestamp:

Sep 21, 2009 10:35:35 AM (15 years ago)

Author:

vboxsync

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

52602

Message:

NAT: makes bsd mbufs buildable on Windows.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_output.c (modified) (4 diffs)
• socket.c (modified) (3 diffs)

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

@@ -172 +172 @@
     
         {
+#ifndef VBOX_WITH_SLIRP_BSD_MBUF
             STAM_PROFILE_START(&pData->StatALIAS_output, a);
-#ifndef VBOX_WITH_SLIRP_BSD_MBUF
             rc = LibAliasOut((m->m_la ? m->m_la : pData->proxy_alias), 
                 mtod(m, char *), m->m_len);
@@ -179 +179 @@
 #else
             struct m_tag *t;
+            STAM_PROFILE_START(&pData->StatALIAS_output, a);
             if (t = m_tag_find(m, PACKET_TAG_ALIAS, NULL) != 0)
             {
@@ -228 +229 @@
 #endif
             {
+#ifdef VBOX_WITH_SLIRP_BSD_MBUF
+                struct m_tag *t;
+                char *tmpbuf = NULL;
+                int tmplen = 0;
+#endif
                 int rc;
                 HTONS(ip->ip_len);
@@ -237 +243 @@
                     mtod(m, char *), m->m_len);
 #else
-                struct m_tag *t;
-                char *tmpbuf = NULL;
-                int tmplen = 0;
                 if (m->m_next != NULL)
                 {

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

@@ -568 +568 @@
         int size;
 #endif
+        int rc = 0;
+        static int signaled = 0;
 
         QSOCKET_LOCK(udb);
@@ -589 +591 @@
         /* if (so->so_fport != htons(53)) */
         {
-            static int signaled = 0;
-            int rc = ioctlsocket(so->s, FIONREAD, &n);
+            rc = ioctlsocket(so->s, FIONREAD, &n);
             
             if (rc == -1 && signaled == 0)
@@ -616 +617 @@
         * 3. attach buffer to allocated header mbuf
         */
-        static int signaled = 0;
-        int rc = ioctlsocket(so->s, FIONREAD, &n);
+        rc = ioctlsocket(so->s, FIONREAD, &n);
         
         if (rc == -1 && signaled == 0)