Changeset 15077 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Dec 8, 2008 3:37:42 AM (16 years ago)

Author:

vboxsync

Message:

slirp: better readability

File:

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

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

@@ -10 +10 @@
 #include <VBox/pdmdrv.h>
 #include <iprt/assert.h>
+
+#if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) 
+# if !defined(RT_OS_WINDOWS)
+#  define DO_ENGAGE_EVENT1(so, fdset, label)            \
+        do {                                            \
+                FD_SET((so)->s, (fdset0));              \
+                UPD_NFDS((so)->s);                      \
+        while(0)
+
+
+#  define DO_ENGAGE_EVENT2(so, fdset0, fdset1, label)   \
+        do {                                            \
+                FD_SET((so)->s, (fdset0));              \
+                FD_SET((so)->s, (fdset1));              \
+                UPD_NFDS((so)->s);                      \
+        while(0)
+# else /* !RT_OS_WINDOWS */
+#  define DO_ENGAGE_EVENT1(so, fdset0, label)           \
+                goto label;
+
+#  define DO_ENGAGE_EVENT2(so, fdset0, fdset1, label) DO_ENGAGE_EVENT1((so), (fdset0), label)
+# endif /* RT_OS_WINDOWS */
+
+# define TCP_ENGAGE_EVENT1(so, fdset0)                   \
+        DO_ENGAGE_EVENT1((so), (fdset0), tcp_engage_event)
+
+# define TCP_ENGAGE_EVENT2(so, fdset0, fdset1)               \
+        DO_ENGAGE_EVENT2((so), (fdset0), (fdset1), tcp_engage_event)
+#endif /* VBOX_WITH_SIMPLIFIED_SLIRP_SYNC */
 
 static const uint8_t special_ethaddr[6] = {
@@ -461 +490 @@
             {
                 STAM_REL_COUNTER_INC(&pData->StatTCPHot);
-#if !defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) || !defined(RT_OS_WINDOWS)
-                FD_SET(so->s, readfds);
-                UPD_NFDS(so->s);
-#else
-engage_event:
+                TCP_ENGAGE_EVENT1(so, readfs);
+#if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+tcp_engage_event:
                 rc = WSAEventSelect(so->s, VBOX_SOCKET_EVENT, FD_ALL_EVENTS);
                 if (rc == SOCKET_ERROR)
@@ -484 +511 @@
             {
                 STAM_REL_COUNTER_INC(&pData->StatTCPHot);
-#if !defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) || !defined(RT_OS_WINDOWS)
-                FD_SET(so->s, writefds);
-                UPD_NFDS(so->s);
-                continue;
-#else
-                goto engage_event;
-#endif
+                TCP_ENGAGE_EVENT1(so, writefds);
             }
 
@@ -500 +521 @@
             {
                 STAM_REL_COUNTER_INC(&pData->StatTCPHot);
-#if !defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) || !defined(RT_OS_WINDOWS)
-                FD_SET(so->s, writefds);
-                UPD_NFDS(so->s);
-#else
-                goto engage_event;
-#endif
+                TCP_ENGAGE_EVENT1(so, writefds);
             }
 
@@ -515 +531 @@
             {
                 STAM_REL_COUNTER_INC(&pData->StatTCPHot);
-#if !defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) || !defined(RT_OS_WINDOWS)
-                FD_SET(so->s, readfds);
-                FD_SET(so->s, xfds);
-                UPD_NFDS(so->s);
-#else
-                goto engage_event;
-#endif
+                TCP_ENGAGE_EVENT2(so->s, readfds, xfds);
             }
         }
@@ -857 +867 @@
             if (so->s != -1 && FD_ISSET(so->s, readfds))
 #else
-            if ((NetworkEvents.lNetworkEvents & FD_READ) && (NetworkEvents.iErrorCode[FD_READ_BIT] == 0))
+            if (((NetworkEvents.lNetworkEvents & FD_READ) && (NetworkEvents.iErrorCode[FD_READ_BIT] == 0))
+#ifdef VBOX_WITH_SLIRP_ICMP
+                || (so->s == pData->icmp_socket.s) /* XXX: How check equality of handles */
+#endif
+            )
 #endif
             {