Changeset 22576 in vbox

Timestamp:

Aug 30, 2009 8:04:02 PM (15 years ago)

Author:

vboxsync

Message:

NAT: logging, warnings

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_icmp.c (modified) (1 diff)
• sbuf.c (modified) (1 diff)
• slirp.c (modified) (3 diffs)

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

@@ -307 +307 @@
     DEBUG_CALL("icmp_input");
     DEBUG_ARG("m = %lx", (long )m);
-    DEBUG_ARG("m_len = %d", m->m_len);
+    DEBUG_ARG("m_len = %d", m ? m->m_len : 0);
 
     icmpstat.icps_received++;

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

@@ -82 +82 @@
     DEBUG_ARG("so = %lx", (long)so);
     DEBUG_ARG("m = %lx", (long)m);
-    DEBUG_ARG("m->m_len = %d", m->m_len);
+    DEBUG_ARG("m->m_len = %d", m ? m->m_len : 0);
 
     STAM_COUNTER_INC(&pData->StatIOSBAppend);

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

@@ -1841 +1841 @@
     ehdr = mtod(m, struct ethhdr *);
     memset(ehdr->h_source, 0xff, ETH_ALEN);
-    ahdr = (struct ahdr *)&ehdr[1];
+    ahdr = (struct arphdr *)&ehdr[1];
     ahdr->ar_hrd = htons(1);
     ahdr->ar_pro = htons(ETH_P_IP);
@@ -1856 +1856 @@
     LogRel(("NAT: ARP request sent\n"));
 }
+
 /* updates the arp cache 
  * @returns 0 - if has found and updated
@@ -1873 +1874 @@
     return 1;
 }
+
 void slirp_arp_cache_add(PNATState pData, uint32_t ip, const uint8_t *ether)
 {