Changeset 15149 in vbox

Timestamp:

Dec 9, 2008 10:09:10 AM (16 years ago)

Author:

vboxsync

Message:

slirp:icmp: set of hacks over Win ICMP Api introduced

1. guest address hack
2. ICMP seq and identifier (see xTracker #2752 for details)

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -329 +329 @@
                 }
 # else /* RT_OS_WINDOWS */
+                pData->icmp_socket.so_laddr.s_addr = ip->ip_src.s_addr; /* XXX: hack*/
+                pData->icmp_socket.so_icmp_id = icp->icmp_id;
+                pData->icmp_socket.so_icmp_seq = icp->icmp_seq;
                 memset(&ipopt, 0, sizeof(IP_OPTION_INFORMATION));
                 ipopt.Ttl = ip->ip_ttl;

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

@@ -877 +877 @@
                                 ip->ip_src.s_addr = icr[i].Address;
                                 ip->ip_p = IPPROTO_ICMP;
-                                ip->ip_dst.s_addr = inet_addr("10.0.0.15"); /*XXX:hack here*/
+                                ip->ip_dst.s_addr = so->so_laddr.s_addr; /*XXX: still the hack*/
                                 ip->ip_hl = sizeof(struct ip) >> 2;
 
@@ -883 +883 @@
                                 icp->icmp_type = ICMP_ECHOREPLY;
                                 icp->icmp_code = 0;
+                                icp->icmp_id = so->so_icmp_id;
+                                icp->icmp_seq = so->so_icmp_seq;
                                 memcpy(icp->icmp_data, icr[i].Data, icr[i].DataSize);
 

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

@@ -23 +23 @@
     struct socket   *so_prev;    /* For a linked list of sockets */
 
-#ifndef RT_OS_WINDOWS
+#if !defined(VBOX_WITH_SLIRP_ICMP) || !defined(RT_OS_WINDOWS)
     int s;                       /* The actual socket */
 #else
@@ -30 +30 @@
             HANDLE sh;
     };
+    uint64_t so_icmp_id; /* XXX: hack */
+    uint64_t so_icmp_seq; /* XXX: hack */
 #endif