Changeset 15060 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Dec 7, 2008 6:48:47 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

40446

Message:

debug logging removed
IP options trimming disabled in ICMP support

File:

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

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

@@ -102 +102 @@
             AssertRelease(ip0->ip_p == IPPROTO_ICMP);
             icp0 = (struct icmp *)((char *)ip0 + (ip0->ip_hl << 2));
-            LogRel(("ip(src:%R[IP4], dst:%R[IP4],id:%x) ip0(src:%R[IP4],dst:%R[IP4],id:%x)\n",
-                    ip->ip_src.s_addr,
-                    ip->ip_dst.s_addr,
-                    ip->ip_id,
-                    ip0->ip_src.s_addr,
-                    ip0->ip_dst.s_addr,
-                    ip0->ip_id));
-            LogRel(("icp(id:%x, seq:%x, type=%d) icp0(id:%x, seq:%x)\n",icp->icmp_id, icp->icmp_seq, icp->icmp_type, icp0->icmp_id, icp0->icmp_seq));
-            if (
-                ((icp->icmp_type != ICMP_ECHO && ip->ip_src.s_addr == ip0->ip_dst.s_addr)
+            if (((icp->icmp_type != ICMP_ECHO && ip->ip_src.s_addr == ip0->ip_dst.s_addr)
                 ||(icp->icmp_type == ICMP_ECHO && ip->ip_dst.s_addr == ip0->ip_dst.s_addr))
                 && icp->icmp_id == icp0->icmp_id
@@ -455 +446 @@
   m->m_len += hlen;
 
+#ifndef VBOX_WITH_SLIRP_ICMP
   /* fill in ip */
   if (optlen > 0) {
@@ -468 +460 @@
     m->m_len -= optlen;
   }
-  LogRel(("%s, ttl %d msg_type=%d code=%d\n", __FUNCTION__, ip->ip_ttl, icp->icmp_type, icp->icmp_code ));
-#ifndef VBOX_WITH_SLIRP_ICMP
   ip->ip_ttl = MAXTTL;
   { /* swap */
@@ -477 +467 @@
     ip->ip_src = icmp_dst;
   }
-#endif
+#endif /* !VBOX_WITH_SLIRP_ICMP */
 
   (void ) ip_output(pData, (struct socket *)NULL, m);