Changeset 50189 in vbox

Timestamp:

Jan 23, 2014 4:55:24 PM (11 years ago)

Author:

vboxsync

Message:

lwip: Sync with git master up to
commit 018719d9d3229bcc7e05995be2221dd13eb724ee
Date: Fri Jan 17 22:32:36 2014 +0100

Provide missing options to disable checksum generation and
verification.

Since the options are on by default, the same object code is
generated.

Location:

trunk/src/VBox/Devices/Network/lwip-new

Files:

• CHANGELOG (modified) (1 diff)
• src/core/ipv4/icmp.c (modified) (3 diffs)
• src/core/ipv4/ip_frag.c (modified) (2 diffs)
• src/core/ipv6/icmp6.c (modified) (4 diffs)
• src/core/ipv6/mld6.c (modified) (1 diff)
• src/core/ipv6/nd6.c (modified) (3 diffs)
• src/include/lwip/opt.h (modified) (3 diffs)

trunk/src/VBox/Devices/Network/lwip-new/CHANGELOG

@@ -6 +6 @@
 
  ++ New features:
+
+  2014-01-17: Jiri Engelthaler
+  * icmp, icmp6, opt.h: patch #8027: Completed HW checksuming for IPv4 and
+    IPv6 ICMP's
 
   2012-03-25: Simon Goldschmidt (idea by Mason)

trunk/src/VBox/Devices/Network/lwip-new/src/core/ipv4/icmp.c

@@ -146 +146 @@
       goto lenerr;
     }
+#if CHECKSUM_CHECK_ICMP
     if (inet_chksum_pbuf(p) != 0) {
       LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: checksum failed for received ICMP echo\n"));
@@ -153 +154 @@
       return;
     }
+#endif
 #if LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN
     if (pbuf_header(p, (PBUF_IP_HLEN + PBUF_LINK_HLEN))) {
@@ -428 +430 @@
   /* calculate checksum */
   icmphdr->chksum = 0;
+#if CHECKSUM_GEN_ICMP
   icmphdr->chksum = inet_chksum(icmphdr, q->len);
+#endif
   ICMP_STATS_INC(icmp.xmit);
   /* increase number of messages attempted to send */

trunk/src/VBox/Devices/Network/lwip-new/src/core/ipv4/ip_frag.c

@@ -580 +580 @@
     IPH_CHKSUM_SET(fraghdr, 0);
     /* @todo: do we need to set calculate the correct checksum? */
+#if CHECKSUM_GEN_IP
     IPH_CHKSUM_SET(fraghdr, inet_chksum(fraghdr, IP_HLEN));
+#endif /* CHECKSUM_GEN_IP */
 
     p = ipr->p;
@@ -812 +814 @@
     IPH_LEN_SET(iphdr, htons(cop + IP_HLEN));
     IPH_CHKSUM_SET(iphdr, 0);
+#if CHECKSUM_GEN_IP
     IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, IP_HLEN));
+#endif /* CHECKSUM_GEN_IP */
 
 #if IP_FRAG_USES_STATIC_BUF

trunk/src/VBox/Devices/Network/lwip-new/src/core/ipv6/icmp6.c

@@ -102 +102 @@
   icmp6hdr = (struct icmp6_hdr *)p->payload;
 
-#if LWIP_ICMP6_CHECKSUM_CHECK
+#if CHECKSUM_CHECK_ICMP6
   if (ip6_chksum_pseudo(p, IP6_NEXTH_ICMP6, p->tot_len, ip6_current_src_addr(),
                         ip6_current_dest_addr()) != 0) {
@@ -111 +111 @@
     return;
   }
-#endif /* LWIP_ICMP6_CHECKSUM_CHECK */
+#endif /* CHECKSUM_CHECK_ICMP6 */
 
   switch (icmp6hdr->type) {
@@ -185 +185 @@
     ((struct icmp6_echo_hdr *)(r->payload))->type = ICMP6_TYPE_EREP;
     ((struct icmp6_echo_hdr *)(r->payload))->chksum = 0;
+#if CHECKSUM_GEN_ICMP6
     ((struct icmp6_echo_hdr *)(r->payload))->chksum = ip6_chksum_pseudo(r,
         IP6_NEXTH_ICMP6, r->tot_len, reply_src, ip6_current_src_addr());
+#endif /* CHECKSUM_GEN_ICMP6 */
 
     /* Send reply. */
@@ -395 +397 @@
   /* calculate checksum */
   icmp6hdr->chksum = 0;
+#if CHECKSUM_GEN_ICMP6
   icmp6hdr->chksum = ip6_chksum_pseudo(q, IP6_NEXTH_ICMP6, q->tot_len,
     reply_src, reply_dest);
+#endif /* CHECKSUM_GEN_ICMP6 */
 
   ICMP6_STATS_INC(icmp6.xmit);

trunk/src/VBox/Devices/Network/lwip-new/src/core/ipv6/mld6.c

@@ -567 +567 @@
   ip6_addr_set(&(mld_hdr->multicast_address), &(group->group_address));
 
+#if CHECKSUM_GEN_ICMP6
   mld_hdr->chksum = ip6_chksum_pseudo(p, IP6_NEXTH_ICMP6, p->len,
     src_addr, &(group->group_address));
+#endif /* CHECKSUM_GEN_ICMP6 */
 
   /* Add hop-by-hop headers options: router alert with MLD value. */

trunk/src/VBox/Devices/Network/lwip-new/src/core/ipv6/nd6.c

@@ -889 +889 @@
   }
 
+#if CHECKSUM_GEN_ICMP6
   ns_hdr->chksum = ip6_chksum_pseudo(p, IP6_NEXTH_ICMP6, p->len, src_addr,
     target_addr);
+#endif /* CHECKSUM_GEN_ICMP6 */
 
   /* Send the packet out. */
@@ -961 +963 @@
   }
 
+#if CHECKSUM_GEN_ICMP6
   na_hdr->chksum = ip6_chksum_pseudo(p, IP6_NEXTH_ICMP6, p->len, src_addr,
     dest_addr);
+#endif /* CHECKSUM_GEN_ICMP6 */
 
   /* Send the packet out. */
@@ -1028 +1032 @@
   }
 
+#if CHECKSUM_GEN_ICMP6
   rs_hdr->chksum = ip6_chksum_pseudo(p, IP6_NEXTH_ICMP6, p->len, src_addr,
     &multicast_address);
+#endif /* CHECKSUM_GEN_ICMP6 */
 
   /* Send the packet out. */

trunk/src/VBox/Devices/Network/lwip-new/src/include/lwip/opt.h

@@ -1882 +1882 @@
  
 /**
+ * CHECKSUM_GEN_ICMP6==1: Generate checksums in software for outgoing ICMP6 packets.
+ */
+#ifndef CHECKSUM_GEN_ICMP6
+#define CHECKSUM_GEN_ICMP6              1
+#endif
+ 
+/**
  * CHECKSUM_CHECK_IP==1: Check checksums in software for incoming IP packets.
  */
@@ -1900 +1907 @@
 #ifndef CHECKSUM_CHECK_TCP
 #define CHECKSUM_CHECK_TCP              1
+#endif
+
+/**
+ * CHECKSUM_CHECK_ICMP==1: Check checksums in software for incoming ICMP packets.
+ */
+#ifndef CHECKSUM_CHECK_ICMP
+#define CHECKSUM_CHECK_ICMP             1
+#endif
+
+/**
+ * CHECKSUM_CHECK_ICMP6==1: Check checksums in software for incoming ICMPv6 packets
+ */
+#ifndef CHECKSUM_CHECK_ICMP6
+#define CHECKSUM_CHECK_ICMP6            1
 #endif
 
@@ -1956 +1977 @@
 #ifndef LWIP_ICMP6_HL
 #define LWIP_ICMP6_HL                   255
-#endif
-
-/**
- * LWIP_ICMP6_CHECKSUM_CHECK==1: verify checksum on ICMPv6 packets
- */
-#ifndef LWIP_ICMP6_CHECKSUM_CHECK
-#define LWIP_ICMP6_CHECKSUM_CHECK       1
 #endif