Changeset 15575 in vbox

Timestamp:

Dec 16, 2008 11:38:54 AM (16 years ago)

Author:

vboxsync

Message:

slirp:icmp: fix on issue ICMP to alliased (DNS) addresses

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -348 +348 @@
 #endif
 
-#endif
+#define DO_ALIAS(paddr)                                                     \
+do {                                                                        \
+    if ((paddr)->s_addr == dns_addr.s_addr)                                 \
+    {                                                                       \
+        (paddr)->s_addr = htonl(ntohl(special_addr.s_addr) | CTL_DNS);      \
+    }                                                                       \
+} while(0)
+#endif

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

@@ -814 +814 @@
     if (   icp->icmp_type == ICMP_TIMXCEED
         || icp->icmp_type == ICMP_UNREACH)
+    {
         ip = &icp->icmp_ip;
+        DO_ALIAS(&ip->ip_dst);
+    }
+    else
+    {
+        DO_ALIAS(&ip->ip_src);
+    }
 
     icm = icmp_find_original_mbuf(pData, ip);
@@ -932 +939 @@
                 ip = mtod(m, struct ip *);
                 ip->ip_src.s_addr = icr[i].Address;
+                DO_ALIAS(&ip->ip_src);
                 ip->ip_p = IPPROTO_ICMP;
                 ip->ip_dst.s_addr = so->so_laddr.s_addr; /*XXX: still the hack*/