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

Timestamp:

Dec 10, 2008 2:45:14 AM (16 years ago)

Author:

vboxsync

Message:

slirp: readability

File:

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

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

@@ -26 +26 @@
         UPD_NFDS((so)->s);                           \
     } while(0)
+
+# define DO_POLL_EVENTS(rc, error, so, events, label) do {} while (0)
 
 # ifdef VBOX_WITH_SLIRP_ICMP
@@ -60 +62 @@
     DO_ENGAGE_EVENT1((so), (fdset1), label)
 
+# define DO_POLL_EVENTS(rc, error, so, events, label)                       \
+    (rc) = WSAEnumNetworkEvents((so)->s, VBOX_SOCKET_EVENT, (events));      \
+    if ((rc) == SOCKET_ERROR)                                               \
+    {                                                                       \
+        (error) = WSAGetLastError();                                        \
+        LogRel(("WSAEnumNetworkEvents " #label " error %d\n", (error)));    \
+        continue;                                                           \
+    }
+
 #endif /* defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS) */
 
@@ -70 +81 @@
 #define UDP_ENGAGE_EVENT(so, fdset) \
     DO_ENGAGE_EVENT1((so), (fdset), UDP)
+
+#define POLL_TCP_EVENTS(rc, error, so, events) \
+    DO_POLL_EVENTS((rc), (error), (so), (events), TCP)
+
+#define POLL_UDP_EVENTS(rc, error, so, events) \
+    DO_POLL_EVENTS((rc), (error), (so), (events), UDP)
 
 static const uint8_t special_ethaddr[6] =
@@ -687 +704 @@
                 continue;
 
-#if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-            rc = WSAEnumNetworkEvents(so->s, VBOX_SOCKET_EVENT, &NetworkEvents);
-            if (rc == SOCKET_ERROR)
-            {
-                error = WSAGetLastError();
-                LogRel(("WSAEnumNetworkEvents TCP error %d\n", error));
-                continue;
-            }
-#endif
+            POLL_TCP_EVENTS(rc, error, so, NetworkEvents);
 
             /*
@@ -873 +882 @@
             so_next = so->so_next;
 
-#if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-            rc = WSAEnumNetworkEvents(so->s, VBOX_SOCKET_EVENT, &NetworkEvents);
-            if (rc == SOCKET_ERROR)
-            {
-                error = WSAGetLastError();
-                LogRel(("WSAEnumNetworkEvents TCP error %d\n", error));
-                continue;
-            }
-#endif
+            POLL_UDP_EVENTS(rc, error, so, NetworkEvents);
+
 #if !defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) || !defined(RT_OS_WINDOWS)
             if (so->s != -1 && FD_ISSET(so->s, readfds))