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

Timestamp:

Dec 9, 2008 10:08:04 PM (16 years ago)

Author:

vboxsync

Message:

slirp: fixed ICMP on Linux

File:

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

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

@@ -28 +28 @@
 
 # ifdef VBOX_WITH_SLIRP_ICMP
-#  define ICMP_ENGAGE_EVENT(so, fdset1, fdset2)      \
-    DO_ENGAGE_EVENT2((so), (fdset1), (fdset2), ICMP)
+#  define ICMP_ENGAGE_EVENT(so, fdset)               \
+    DO_ENGAGE_EVENT1((so), (fdset), ICMP)
 # else /* !VBOX_WITH_SLIRP_ICMP */
 #  define ICMP_ENGAGE_EVENT(so, fdset1, fdset2)      \
@@ -603 +603 @@
             }
         }
-        ICMP_ENGAGE_EVENT(&pData->icmp_socket, readfds, writefds);
+
+        if (pData->icmp_socket.s != -1)
+            ICMP_ENGAGE_EVENT(&pData->icmp_socket, readfds);
     }
 
@@ -893 +895 @@
         sorecvfrom(pData, &pData->icmp_socket);
 # else
-        if (so->s != -1 && FD_ISSET(so->s, readfds))
-        {
+        if (pData->icmp_socket.s != -1 && FD_ISSET(pData->icmp_socket.s, readfds))
             sorecvfrom(pData, &pData->icmp_socket);
-        }
 # endif
 #endif