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

Timestamp:

Dec 10, 2008 8:17:39 AM (16 years ago)

Author:

vboxsync

Message:

slirp:icmp ignoring all incomming ICMP messages except TIMEXEED and ECHOREPLY

File:

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

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

@@ -13 +13 @@
 #include <sys/filio.h>
 #endif
-#if defined(VBOX_WITH_SLIRP_ICMP) && defined (RT_OS_WINDOWS) 
+#if defined(VBOX_WITH_SLIRP_ICMP) && defined (RT_OS_WINDOWS)
 #include <iphlpapi.h>
 #include <icmpapi.h>
@@ -439 +439 @@
     {
         /* This is a "ping" reply */
-#if !defined(VBOX_WITH_SLIRP_ICMP) || (defined(VBOX_WITH_SLIRP_ICMP) && !defined(RT_OS_WINDOWS)) 
+#if !defined(VBOX_WITH_SLIRP_ICMP) || (defined(VBOX_WITH_SLIRP_ICMP) && !defined(RT_OS_WINDOWS))
         sorecvfrom_icmp_unix(pData, so);
 #endif
@@ -780 +780 @@
 
 #ifdef VBOX_WITH_SLIRP_ICMP
-static void 
+static void
 send_icmp_to_guest(PNATState pData, char *buff, size_t len, struct socket *so, const struct sockaddr_in *addr)
 {
@@ -794 +794 @@
     icp = (struct icmp *)((char *)ip + (ip->ip_hl << 2));
 
-    Assert(icp->icmp_type == ICMP_ECHOREPLY || icp->icmp_type == ICMP_TIMXCEED);
+    if (icp->icmp_type != ICMP_ECHOREPLY && icp->icmp_type != ICMP_TIMXCEED)
+    {
+        LogRel(("received ICMP(t:%d, c:%d)\n", icp->icmp_type, icp->icmp_code));
+        return;
+    }
 
     if (icp->icmp_type == ICMP_TIMXCEED)
@@ -849 +853 @@
 
 # ifdef RT_OS_WINDOWS
-static void 
+static void
 sorecvfrom_icmp_win(PNATState pData, struct socket *so)
 {
@@ -872 +876 @@
     for (i = 0; i < len; ++i)
     {
-        switch(icr[i].Status) 
+        switch(icr[i].Status)
         {
             case IP_DEST_HOST_UNREACHABLE:
@@ -892 +896 @@
                 ip->ip_dst.s_addr = so->so_laddr.s_addr; /*XXX: still the hack*/
                 ip->ip_hl = sizeof(struct ip) >> 2; /* requiered for icmp_reflect, no IP options */
-                ip->ip_ttl = icr[i].Options.Ttl; 
+                ip->ip_ttl = icr[i].Options.Ttl;
 
                 icp = (struct icmp *)&ip[1]; /* no options */
@@ -901 +905 @@
                 memcpy(icp->icmp_data, icr[i].Data, icr[i].DataSize);
 
-                ip->ip_len = sizeof(struct ip) + ICMP_MINLEN + icr[i].DataSize; 
+                ip->ip_len = sizeof(struct ip) + ICMP_MINLEN + icr[i].DataSize;
                 m->m_len = ip->ip_len;
 
@@ -908 +912 @@
 
                 ip_broken = icr[i].Data;
-                icm = icmp_find_original_mbuf(pData, ip_broken);     
+                icm = icmp_find_original_mbuf(pData, ip_broken);
                 if (icm == NULL) {
                     LogRel(("ICMP: can't find original package (first double word %x)\n", *(uint32_t *)ip_broken));
@@ -918 +922 @@
                 src = ip->ip_src.s_addr;
                 ip->ip_dst.s_addr = src;
-                ip->ip_dst.s_addr = icr[i].Address; 
+                ip->ip_dst.s_addr = icr[i].Address;
                 icp = (struct icmp *)((char *)ip + (ip->ip_hl << 2));
                 ip_broken->ip_src.s_addr = src; /*it packet sent from host not from guest*/