Changeset 15201 in vbox for trunk/src/VBox/Devices/Network/slirp/slirp.c

Timestamp:

Dec 9, 2008 8:35:15 PM (16 years ago)

Author:

vboxsync

Message:

slirp:icmp: ICM socket is out of udp socket queue now. Unix hangs should gone now.

File:

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

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

@@ -12 +12 @@
 
 #if !defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) || !defined(RT_OS_WINDOWS)
+
+# 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 */
+#endif /* !VBOX_WITH_SLIRP_ICMP */
+
 # define DO_ENGAGE_EVENT1(so, fdset, label)         \
     do {                                            \
@@ -26 +33 @@
     } 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)                                                    \
     do {                                                                                        \
@@ -49 +58 @@
 #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] = {
@@ -583 +595 @@
             }
         }
+        ICMP_ENGAGE_EVENT(&pData->icmp_socket, readfds);
+        ICMP_ENGAGE_EVENT(&pData->icmp_socket, writefds);
     }
 
@@ -867 +881 @@
             }
         }
-#if defined(VBOX_WITH_SLIRP_ICMP) && defined(RT_OS_WINDOWS)
+#if defined(VBOX_WITH_SLIRP_ICMP)
+# if defined(RT_OS_WINDOWS)
         sorecvfrom(pData, &pData->icmp_socket);
-#endif 
+# else
+        if (so->s != -1 && FD_ISSET(so->s, readfds))
+        {
+            sorecvfrom(pData, &pData->icmp_socket);
+        }
+# endif
+#endif
     }