Changeset 15203 in vbox

Timestamp:

Dec 9, 2008 9:14:43 PM (16 years ago)

Author:

vboxsync

Message:

slirp: comments, cosmetics

File:

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

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

@@ -14 +14 @@
 
 # ifdef VBOX_WITH_SLIRP_ICMP
-#  define DO_ENGAGE_EVENT0(so, fdset, label) DO_ENGAGE_EVENT1((so), (fdset), label)
-# else /* VBOX_WITH_SLIRP_ICMP */
-#  define DO_ENGAGE_EVENT0(so, fdset, label) /* ignore */
+#  define ICMP_ENGAGE_EVENT(so, fdset1, fdset2)      \
+    DO_ENGAGE_EVENT2((so), (fdset1), (fdset2), ICMP)
+# else /* !VBOX_WITH_SLIRP_ICMP */
+#  define ICMP_ENGAGE_EVENT(so, fdset1, fdset2)      \
+    /* no ICMP socket */
 #endif /* !VBOX_WITH_SLIRP_ICMP */
 
-# define DO_ENGAGE_EVENT1(so, fdset, label)         \
-    do {                                            \
-        FD_SET((so)->s, (fdset));                   \
-        UPD_NFDS((so)->s);                          \
-    } while(0)
-
-
-# define DO_ENGAGE_EVENT2(so, fdset0, fdset1, label) \
+# define DO_ENGAGE_EVENT1(so, fdset, label)          \
     do {                                             \
-        FD_SET((so)->s, (fdset0));                   \
-        FD_SET((so)->s, (fdset1));                   \
+        FD_SET((so)->s, (fdset));                    \
         UPD_NFDS((so)->s);                           \
     } while(0)
+
+
+# define DO_ENGAGE_EVENT2(so, fdset1, fdset2, label) \
+    do {                                             \
+        FD_SET((so)->s, (fdset1));                   \
+        FD_SET((so)->s, (fdset2));                   \
+        UPD_NFDS((so)->s);                           \
+    } while(0)
+
 #else /* defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS) */
-# define DO_ENGAGE_EVENT0(so, fdset, label) /* ignore */
-
-# define DO_ENGAGE_EVENT1(so, fdset0, label)                                                    \
+
+/*
+ * On Windows, we will be notified by IcmpSendEcho2() when the response arrives.
+ * So no call to WSAEventSelect necessary.
+ */
+# define ICMP_ENGAGE_EVENT(so, fdset1, fdset2) \
+    /* ignore */
+
+# define DO_ENGAGE_EVENT1(so, fdset1, label)                                                    \
     do {                                                                                        \
         rc = WSAEventSelect((so)->s, VBOX_SOCKET_EVENT, FD_ALL_EVENTS);                         \
@@ -47 +56 @@
     } while(0)
 
-# define DO_ENGAGE_EVENT2(so, fdset0, fdset1, label) DO_ENGAGE_EVENT1((so), (fdset0), label)
+# define DO_ENGAGE_EVENT2(so, fdset1, fdset2, label) \
+    O_ENGAGE_EVENT1((so), (fdset1), label)
+
 #endif /* defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS) */
 
-# define TCP_ENGAGE_EVENT1(so, fdset0)                  \
-    DO_ENGAGE_EVENT1((so), (fdset0), TCP)
-
-# define TCP_ENGAGE_EVENT2(so, fdset0, fdset1)          \
-    DO_ENGAGE_EVENT2((so), (fdset0), (fdset1), TCP)
-
-#define UDP_ENGAGE_EVENT(so, fdset)                     \
+#define TCP_ENGAGE_EVENT1(so, fdset) \
+    DO_ENGAGE_EVENT1((so), (fdset), TCP)
+
+#define TCP_ENGAGE_EVENT2(so, fdset1, fdset2) \
+    DO_ENGAGE_EVENT2((so), (fdset1), (fdset2), TCP)
+
+#define UDP_ENGAGE_EVENT(so, fdset) \
     DO_ENGAGE_EVENT1((so), (fdset), UDP)
-
-#define ICMP_ENGAGE_EVENT(so, fdset)                    \
-    DO_ENGAGE_EVENT0((so), (fdset), UDP)
 
 static const uint8_t special_ethaddr[6] = {
@@ -595 +603 @@
             }
         }
-        ICMP_ENGAGE_EVENT(&pData->icmp_socket, readfds);
-        ICMP_ENGAGE_EVENT(&pData->icmp_socket, writefds);
+        ICMP_ENGAGE_EVENT(&pData->icmp_socket, readfds, writefds);
     }
 
@@ -718 +725 @@
                     tcp_connect(pData, so);
 #if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-                    if (!NetworkEvents.lNetworkEvents & FD_CLOSE)
+                    if (!(NetworkEvents.lNetworkEvents & FD_CLOSE))
 #endif
                         continue;
@@ -881 +888 @@
             }
         }
+
 #if defined(VBOX_WITH_SLIRP_ICMP)
 # if defined(RT_OS_WINDOWS)