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

Timestamp:

Dec 18, 2008 10:22:45 PM (16 years ago)

Author:

vboxsync

Message:

slirp:makes icmp support unaware of synchronization method on Windows
(need to be checked on Vista)

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_icmp.c (modified) (4 diffs)
• slirp.c (modified) (1 diff)
• slirp_state.h (modified) (2 diffs)
• socket.c (modified) (1 diff)

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

@@ -42 +42 @@
 #endif
 
+#ifdef RT_OS_WINDOWS
+# ifdef VBOX_WITH_SIMPLIFIED_SLIRP_SYNC
+# define ICMP_SEND_ECHO(event, routine, addr, data, datasize, ipopt)                                        \
+                IcmpSendEcho2(pData->icmp_socket.sh, (event), NULL, NULL, (addr), (data), (datasize),       \
+                               (ipopt), pData->pvIcmpBuffer, pData->szIcmpBuffer, 1)
+# else /* VBOX_WITH_SIMPLIFIED_SLIRP_SYNC */
+# define ICMP_SEND_ECHO(event, routine, addr, data, datasize, ipopt)                                                        \
+                IcmpSendEcho2(pData->icmp_socket.s, NULL, (FARPROC)(routine), (void *)pData, (addr), (data), (datasize),    \
+                             (ipopt), pData->pvIcmpBuffer, pData->szIcmpBuffer, 1)
+static void WINAPI notify_slirp(void *);
+# endif /* !VBOX_WITH_SIMPLIFIED_SLIRP_SYNC */
+#endif /* RT_OS_WINDOWS */
 
 /* The message sent when emulating PING */
@@ -124 +136 @@
     }
     pData->icmp_socket.sh = IcmpCreateFile();
+# ifdef VBOX_WITH_SIMPLIFIED_SLIRP_SYNC
     pData->phEvents[VBOX_ICMP_EVENT_INDEX] = CreateEvent(NULL, FALSE, FALSE, NULL);
+# endif /* VBOX_WITH_SIMPLIFIED_SLIRP_SYNC */
     pData->szIcmpBuffer = sizeof(ICMP_ECHO_REPLY) * 10;
     pData->pvIcmpBuffer = malloc(pData->szIcmpBuffer);
@@ -389 +403 @@
                 memset(&ipopt, 0, sizeof(IP_OPTION_INFORMATION));
                 ipopt.Ttl = ip->ip_ttl;
-                status = IcmpSendEcho2(pData->icmp_socket.sh, pData->phEvents[VBOX_ICMP_EVENT_INDEX],
-                                       NULL, NULL, addr.sin_addr.s_addr, icp->icmp_data,
-                                       icmplen - offsetof(struct icmp, icmp_data) , &ipopt,
-                                       pData->pvIcmpBuffer, pData->szIcmpBuffer, 1);
+                status = ICMP_SEND_ECHO(pData->phEvents[VBOX_ICMP_EVENT_INDEX], notify_slirp, addr.sin_addr.s_addr, 
+                                icp->icmp_data, icmplen - ICMP_MINLEN, &ipopt);
                 if (status == 0 && (error = GetLastError()) != ERROR_IO_PENDING)
                 {
@@ -615 +627 @@
     icmpstat.icps_reflect++;
 }
+#if defined(RT_OS_WINDOWS) && !defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC)
+static void WINAPI  
+notify_slirp(void *ctx)
+{
+    /* pData name is important see slirp_state.h */
+    PNATState pData = (PNATState)ctx;
+    fIcmp = 1;
+}
+#endif

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

@@ -706 +706 @@
     {
 #if defined(RT_OS_WINDOWS)
+        /*XXX: before renaming please make see define 
+         * fIcmp in slirp_state.h
+         */
         if (fIcmp)
             sorecvfrom(pData, &pData->icmp_socket);

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -134 +134 @@
     HANDLE phEvents[VBOX_EVENT_COUNT];
 #endif
+#if !defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+    int fIcmp;
+#endif
     STAMPROFILE StatFill;
     STAMPROFILE StatPoll;
@@ -247 +250 @@
 #define tcp_reass_overflows pData->tcp_reass_overflows
 
+#if !defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+# define fIcmp pData->fIcmp
+#endif
+
 #endif /* !_slirp_state_h_ */

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

@@ -914 +914 @@
 
     len = pData->pfIcmpParseReplies(pData->pvIcmpBuffer, pData->szIcmpBuffer);
+#ifndef VBOX_WITH_SIMPLIFIED_SLIRP_SYNC
+    fIcmp = 0;  /* reply processed */
+#endif
     if (len < 0)
     {