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

Timestamp:

Nov 20, 2008 10:09:55 AM (16 years ago)

Author:

vboxsync

Message:

check sum calculation was fixed

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip.h (modified) (1 diff)
• ip_input.c (modified) (5 diffs)
• mbuf.h (modified) (2 diffs)
• tcp_input.c (modified) (1 diff)
• udp.c (modified) (1 diff)

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

@@ -44 +44 @@
 /* XXX: Windows has own queue types declared in winnt.h (should look at them once again) */
 # endif
-#define VBOX_WITH_BSD_REASS_CKSUM_HACK
-/* XXX: Don't forget to import BSD routines csum validation of reassembled packet */
 #endif
 

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

@@ -220 +220 @@
         else
                 ip->ip_len -= hlen;
-#endif /* !VBOX_WITH_BSD_REASS */
+#endif /* VBOX_WITH_BSD_REASS */
 
         /*
@@ -514 +514 @@
      */
     ipstat.ips_fragments++;
-    m->m_data = (caddr_t)ip;
+    m->m_hdr.header = ip;
 
     /* Previous ip_reass() started here. */
@@ -521 +521 @@
      * would confuse code below.
      */
-#if 0
     m->m_data += hlen;
     m->m_len -= hlen;
-#endif
 
     /*
@@ -548 +546 @@
     }
 
-#define GETIP(m)    ((struct ip*)((m)->m_data))
+#define GETIP(m)    ((struct ip*)((m)->m_hdr.header))
 
 
@@ -666 +664 @@
      * Make header visible.
      */
+#if 0
     ip->ip_len = (ip->ip_hl << 2) + next;
+#else
+    ip->ip_len = next;
+#endif
     ip->ip_src = fp->ipq_src;
     ip->ip_dst = fp->ipq_dst;
-#ifdef VBOX_WITH_BSD_REASS_CKSUM_HACK
-    ip->ip_sum = 0;
-    m->m_sum_recalculate = 1;
-#endif /* VBOX_WITH_BSD_REASS_CKSUM_HACK */
     TAILQ_REMOVE(head, fp, ipq_list);
     nipq--;
     free(fp);
 
-#if 0
     m->m_len += (ip->ip_hl << 2);
     m->m_data -= (ip->ip_hl << 2);
-#endif
     /* some debugging cruft by sklower, below, will go away soon */
 #if 0

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

@@ -73 +73 @@
         caddr_t mh_data;                /* Location of data */
         int     mh_len;                 /* Amount of data in this mbuf */
-#ifdef VBOX_WITH_BSD_REASS_CKSUM_HACK
-        int     mh_sum_recalculate;
-#endif /* VBOX_WITH_BSD_REASS_CKSUM_HACK */
+#ifdef VBOX_WITH_BSD_REASS
+        void *header;                   /*XXX: in real BSD sources this field lays in pkthdr structure*/
+#endif
 };
 
@@ -111 +111 @@
 #define m_ext           M_dat.m_ext_
 #define m_so            m_hdr.mh_so
-#ifdef VBOX_WITH_BSD_REASS_CKSUM_HACK
-#define m_sum_recalculate m_hdr.mh_sum_recalculate
-#endif /* VBOX_WITH_BSD_REASS_CKSUM_HACK */
 
 #define ifq_prev m_prev

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

@@ -479 +479 @@
          * ti->ti_sum = cksum(m, len);
          * if (ti->ti_sum) { */
-#ifdef VBOX_WITH_BSD_REASS_CKSUM_HACK
-        if (m->m_sum_recalculate == 0 && ip->ip_sum != 0) {
-#endif /* VBOX_WITH_BSD_REASS_CKSUM_HACK */
         if(cksum(m, len)) {
           tcpstat.tcps_rcvbadsum++;
           goto drop;
         }
-#ifdef VBOX_WITH_BSD_REASS_CKSUM_HACK
-        }
-#endif /* VBOX_WITH_BSD_REASS_CKSUM_HACK */
 
         /*

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

@@ -122 +122 @@
          * Checksum extended UDP header and data.
          */
-        if (udpcksum && uh->uh_sum
-#ifdef VBOX_WITH_BSD_REASS_CKSUM_HACK
-            /*XXX: hack over csum calculation */
-            && (m->m_sum_recalculate == 0 && ip->ip_sum != 0)
-#endif /* VBOX_WITH_BSD_REASS_CKSUM_HACK */
-            ) {
+        if (udpcksum && uh->uh_sum) {
           ((struct ipovly *)ip)->ih_next = 0;
           ((struct ipovly *)ip)->ih_prev = 0;