[lwip-devel] [patch #7905] Add RFC3542-style checksum compuation on raw, IPv6 sockets.

[Grant Erickson]

URL:
  <http://savannah.nongnu.org/patch/?7905>

                 Summary: Add RFC3542-style checksum compuation on raw, IPv6
sockets.
                 Project: lwIP - A Lightweight TCP/IP stack
            Submitted by: marathon96
            Submitted on: Thu 20 Dec 2012 04:35:48 PM GMT
                Category: None
                Priority: 5 - Normal
                  Status: None
                 Privacy: Public
             Assigned to: None
        Originator Email: 
             Open/Closed: Open
         Discussion Lock: Any
         Planned Release: None

    _______________________________________________________

Details:

From: Grant Erickson <address@hidden>
Date: Wed, 19 Dec 2012 18:21:07 -0800
Subject: [PATCH 1/2] Add RFC3542-style checksum compuation on raw, IPv6
sockets

This patch adds support for RFC3542-style checksum computation on raw,
IPv6 sockets via the IPV6_CHECKSUM socket option.

This allows the development of application-layer utilities such as
ping6 which are unable to compute the raw packet checksum without a
prior knowledge of the source address selection.

---
 src/api/sockets.c      | 84 ++++++++++++++++++++++
 src/core/raw.c         | 11 +++
 src/include/lwip/raw.h |  5 ++
 .../sw/tps/lwip/lwip/src/include/lwip/sockets.h    |  3 +-
 4 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/src/api/sockets.c b/src/api/sockets.c
index 6603671..64bdb19 100644
--- a/src/api/sockets.c
+++ b/src/api/sockets.c
@@ -1710,6 +1710,22 @@ lwip_getsockopt(int s, int level, int optname, void
*optval, socklen_t *optlen)
     }  /* switch (optname) */
     break;
 #endif /* LWIP_UDP && LWIP_UDPLITE*/
+  /* Level: IPPROTO_RAW */
+  case IPPROTO_RAW:
+    switch (optname) {
+#if LWIP_IPV6
+    case IPV6_CHECKSUM:
+      if (*optlen < sizeof(int)) {
+        err = EINVAL;
+        break;
+      }
+#endif /* LWIP_IPV6 */
+    default:
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_RAW, UNIMPL:
optname=0x%x, ..)\n",
+                                  s, optname));
+      err = ENOPROTOOPT;
+    }  /* switch (optname) */
+    break;
 /* UNDEFINED LEVEL */
   default:
       LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, level=0x%x, UNIMPL:
optname=0x%x, ..)\n",
@@ -1960,6 +1976,24 @@ lwip_getsockopt_internal(void *arg)
     }  /* switch (optname) */
     break;
 #endif /* LWIP_UDP */
+  /* Level: IPPROTO_RAW */
+  case IPPROTO_RAW:
+    switch (optname) {
+#if LWIP_IPV6
+    case IPV6_CHECKSUM:
+         if (sock->conn->pcb.raw->chksum_reqd == 0)
+        *(int *)optval = -1;
+      else
+        *(int *)optval = sock->conn->pcb.raw->chksum_offset;
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_RAW,
IPV6_CHECKSUM) = %d\n",
+                  s, (*(int*)optval)) );
+      break;
+#endif /* LWIP_IPV6 */
+    default:
+      LWIP_ASSERT("unhandled optname", 0);
+      break;
+    }  /* switch (optname) */
+       break;
   default:
     LWIP_ASSERT("unhandled level", 0);
     break;
@@ -2134,12 +2168,26 @@ lwip_setsockopt(int s, int level, int optname, const
void *optval, socklen_t opt
         return 0;
 
       break;
+    case IPV6_CHECKSUM:
+        err = EINVAL;
+        break;
       default:
         LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_IPV6,
UNIMPL: optname=0x%x, ..)\n",
                     s, optname));
         err = ENOPROTOOPT;
     }  /* switch (optname) */
     break;
+  case IPPROTO_ICMPV6:
+    switch (optname) {
+    case IPV6_CHECKSUM:
+        err = EINVAL;
+        break;
+    default:
+        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_ICMPV6,
UNIMPL: optname=0x%x, ..)\n",
+                                    s, optname));
+        err = ENOPROTOOPT;
+    }  /* switch (optname) */
+    break;
 #endif /* LWIP_IPV6 */
 
 #if LWIP_UDP && LWIP_UDPLITE
@@ -2166,6 +2214,22 @@ lwip_setsockopt(int s, int level, int optname, const
void *optval, socklen_t opt
     }  /* switch (optname) */
     break;
 #endif /* LWIP_UDP && LWIP_UDPLITE */
+/* Level: IPPROTO_RAW */
+  case IPPROTO_RAW:
+    switch (optname) {
+#if LWIP_IPV6
+    case IPV6_CHECKSUM:
+        /* Per RFC3542, odd offsets are not allowed */
+        if ((*(int *)optval > 0) && (*(int *)optval & 1))
+            err = EINVAL;
+        break;
+#endif /* LWIP_IPV6 */
+    default:
+        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_RAW, UNIMPL:
optname=0x%x, ..)\n",
+                                    s, optname));
+        err = ENOPROTOOPT;
+    } /* switch (optname) */
+       break;
 /* UNDEFINED LEVEL */
   default:
     LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, level=0x%x, UNIMPL:
optname=0x%x, ..)\n",
@@ -2422,6 +2486,26 @@ lwip_setsockopt_internal(void *arg)
     }  /* switch (optname) */
     break;
 #endif /* LWIP_UDP */
+  /* Level: IPPROTO_RAW */
+  case IPPROTO_RAW:
+    switch (optname) {
+#if LWIP_IPV6
+    case IPV6_CHECKSUM:
+      if (*(int *)optval < 0) {
+        sock->conn->pcb.raw->chksum_reqd = 0;
+      } else {
+        sock->conn->pcb.raw->chksum_reqd = 1;
+        sock->conn->pcb.raw->chksum_offset = *(int *)optval;
+      }
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_RAW,
IPV6_CHECKSUM, ..) -> %d\n",
+                  s, sock->conn->pcb.raw->chksum_reqd));
+      break;
+#endif /* LWIP_IPV6 */
+    default:
+      LWIP_ASSERT("unhandled optname", 0);
+      break;
+    }  /* switch (optname) */
+    break;
   default:
     LWIP_ASSERT("unhandled level", 0);
     break;
diff --git a/src/core/raw.c b/src/core/raw.c
index 6f50848..3e21a50 100644
--- a/src/core/raw.c
+++ b/src/core/raw.c
@@ -51,6 +51,7 @@
 #include "arch/perf.h"
 #include "lwip/ip6.h"
 #include "lwip/ip6_addr.h"
+#include "lwip/inet_chksum.h"
 
 #include <string.h>
 
@@ -306,6 +307,16 @@ raw_sendto(struct raw_pcb *pcb, struct pbuf *p, ip_addr_t
*ipaddr)
     src_ip = &pcb->local_ip;
   }
 
+#if LWIP_IPV6
+  /* If requested, based on the IPV6_CHECKSUM socket option per RFC3542, */
+  /* compute the checksum and update the checksum in the payload. */
+  if (PCB_ISIPV6(pcb) && pcb->chksum_reqd) {
+      u16_t chksum;
+      chksum = ip6_chksum_pseudo(q, pcb->protocol, q->tot_len,
ipX_2_ip6(src_ip), ipX_2_ip6(dst_ip));
+      *(u16_t *)(((u8_t *)q->payload) + pcb->chksum_offset) = chksum;
+  }
+#endif
+
   NETIF_SET_HWADDRHINT(netif, &pcb->addr_hint);
   err = ipX_output_if(PCB_ISIPV6(pcb), q, ipX_2_ip(src_ip), ipX_2_ip(dst_ip),
pcb->ttl, pcb->tos, pcb->protocol, netif);
   NETIF_SET_HWADDRHINT(netif, NULL);
diff --git a/src/include/lwip/raw.h b/src/include/lwip/raw.h
index f0c8ed4..e141248 100644
--- a/src/include/lwip/raw.h
+++ b/src/include/lwip/raw.h
@@ -97,6 +97,11 @@ struct raw_pcb {
   } recv;
   /* user-supplied argument for the recv callback */
   void *recv_arg;
+#if LWIP_IPV6
+  /* fields for handling checksum computations as per RFC3542. */
+  u8_t  chksum_reqd;
+  u16_t chksum_offset;
+#endif
 };
 
 /* The following functions is the application layer interface to the
diff --git a/src/include/lwip/sockets.h b/src/include/lwip/sockets.h
index 6906ed3..2ae81b6 100644
--- a/src/include/lwip/sockets.h
+++ b/src/include/lwip/sockets.h
@@ -185,7 +185,8 @@ struct linger {
 /*
  * Options for level IPPROTO_IPV6
  */
-#define IPV6_V6ONLY 27 /* RFC3493: boolean control to restrict AF_INET6
sockets to IPv6 communications only. */
+#define IPV6_CHECKSUM       7  /* RFC3542: calculate and insert the ICMPv6
checksum for raw sockets. */
+#define IPV6_V6ONLY         27 /* RFC3493: boolean control to restrict
AF_INET6 sockets to IPv6 communications only. */
 #endif /* LWIP_IPV6 */
 
 #if LWIP_UDP && LWIP_UDPLITE



    _______________________________________________________

File Attachments:


-------------------------------------------------------
Date: Thu 20 Dec 2012 04:35:48 PM GMT  Name: rfc3542-checksum-0002.0.patch 
Size: 7kB   By: marathon96
Patch 2/2.
<http://savannah.nongnu.org/patch/download.php?file_id=27131>

    _______________________________________________________

Reply to this item at:

  <http://savannah.nongnu.org/patch/?7905>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.nongnu.org/