Merge pull request #4911 from mikaleppanen/lwip_ipv4v6_ppp

Support cellular IPv4v6 dual stack in LWIP

Author: 0xc0170

features/FEATURE_LWIP/lwip-interface/EthernetInterface.cpp

@@ -49,7 +49,8 @@ nsapi_error_t EthernetInterface::connect()
     return mbed_lwip_bringup_2(_dhcp, false,
             _ip_address[0] ? _ip_address : 0,
             _netmask[0] ? _netmask : 0,
-            _gateway[0] ? _gateway : 0);
+            _gateway[0] ? _gateway : 0,
+            DEFAULT_STACK);
 }
 
 nsapi_error_t EthernetInterface::disconnect()

features/FEATURE_LWIP/lwip-interface/lwip-sys/arch/cc.h

@@ -117,8 +117,66 @@ void assert_printf(char *msg, int line, char *file);
 #endif // MBED_CONF_LWIP_USE_MBED_TRACE
 #endif 
 
+#if TRACE_TO_ASCII_HEX_DUMP
+#define TRACE_TO_ASCII_HEX_DUMPF(prefix, len, data) trace_to_ascii_hex_dump(prefix, len, data)
+void trace_to_ascii_hex_dump(char* prefix, int len, char *data);
+#else
+#define TRACE_TO_ASCII_HEX_DUMPF(prefix, len, data) ((void)0)
+#endif
+
 #include "cmsis.h"
 #define LWIP_PLATFORM_HTONS(x)      __REV16(x)
 #define LWIP_PLATFORM_HTONL(x)      __REV(x)
 
+/* Define the memory area for the lwip's memory pools */
+#ifndef MEMP_SECTION
+#if defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM)
+#  if defined (__ICCARM__)
+#     define MEMP_SECTION
+#  elif defined(TOOLCHAIN_GCC_CR)
+#     define MEMP_SECTION __attribute__((section(".data.$RamPeriph32")))
+#  else
+#     define MEMP_SECTION __attribute__((section("AHBSRAM0"),aligned))
+#  endif
+#elif defined(TARGET_LPC1768)
+#  if defined (__ICCARM__)
+#     define MEMP_SECTION
+#  elif defined(TOOLCHAIN_GCC_CR)
+#     define MEMP_SECTION __attribute__((section(".data.$RamPeriph32")))
+#  else
+#     define MEMP_SECTION __attribute__((section("AHBSRAM1"),aligned))
+#  endif
+#endif
+#endif
+
+#ifdef MEMP_SECTION
+#define SET_MEMP_SECTION(name) extern uint8_t MEMP_SECTION name[]
+
+#if defined (__ICCARM__)
+#pragma default_variable_attributes = @ ".ethusbram"
+#endif
+SET_MEMP_SECTION(memp_memory_REASSDATA_base);
+SET_MEMP_SECTION(memp_memory_TCP_PCB_LISTEN_base);
+SET_MEMP_SECTION(memp_memory_PBUF_POOL_base);
+SET_MEMP_SECTION(memp_memory_NETCONN_base);
+SET_MEMP_SECTION(memp_memory_IGMP_GROUP_base);
+SET_MEMP_SECTION(memp_memory_UDP_PCB_base);
+SET_MEMP_SECTION(memp_memory_TCP_PCB_base);
+SET_MEMP_SECTION(memp_memory_FRAG_PBUF_base);
+SET_MEMP_SECTION(memp_memory_PBUF_base);
+SET_MEMP_SECTION(memp_memory_MLD6_GROUP_base);
+SET_MEMP_SECTION(memp_memory_IP6_REASSDATA_base);
+SET_MEMP_SECTION(memp_memory_NETBUF_base);
+SET_MEMP_SECTION(memp_memory_TCPIP_MSG_INPKT_base);
+SET_MEMP_SECTION(memp_memory_SYS_TIMEOUT_base);
+SET_MEMP_SECTION(memp_memory_TCP_SEG_base);
+SET_MEMP_SECTION(memp_memory_TCPIP_MSG_API_base);
+SET_MEMP_SECTION(memp_memory_PPP_PCB_base);
+SET_MEMP_SECTION(memp_memory_PPPOS_PCB_base);
+SET_MEMP_SECTION(memp_memory_PPP_PCB_base);
+#if defined (__ICCARM__)
+#pragma default_variable_attributes =
+#endif
+#endif
+
 #endif /* __CC_H__ */ 

features/FEATURE_LWIP/lwip-interface/lwip-sys/arch/lwip_sys_arch.c

@@ -590,4 +590,23 @@ void assert_printf(char *msg, int line, char *file) {
 }
 #endif // MBED_CONF_LWIP_USE_MBED_TRACE
 
+#if TRACE_TO_ASCII_HEX_DUMP
+void trace_to_ascii_hex_dump(char *prefix, int len, char *data)
+{
+    int line_len = 0;
+
+    for (int i = 0; i < len; i++) {
+       if ((line_len % 16) == 0) {
+           if (line_len != 0) {
+               LWIP_PLATFORM_DIAG(("\n"));
+           }
+           LWIP_PLATFORM_DIAG(("%s %06x", prefix, line_len));
+       }
+       line_len++;
+       LWIP_PLATFORM_DIAG((" %02x", data[i]));
+    }
+    LWIP_PLATFORM_DIAG(("\n"));
+}
+#endif
+
 #endif /* LWIP_DEBUG */

features/FEATURE_LWIP/lwip-interface/lwip-sys/lwip_random.c

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#include "lwip/opt.h"
+#include "lwip/debug.h"
+#include "lwip/def.h"
 #include "lwip_random.h"
 
 #if FEATURE_COMMON_PAL

features/FEATURE_LWIP/lwip-interface/lwip-sys/lwip_random.h

@@ -17,10 +17,6 @@
 #ifndef LWIP_HDR_RANDOM_H
 #define LWIP_HDR_RANDOM_H
 
-#include "lwip/opt.h"
-#include "lwip/debug.h"
-#include "lwip/def.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

features/FEATURE_LWIP/lwip-interface/lwip-sys/lwip_tcp_isn.c

@@ -70,7 +70,7 @@
  * Author: David van Moolenbroek <[email protected]>
  */
 
-#include "lwip_tcp_isn.h"
+#include "lwip/opt.h"
 #include "lwip/ip_addr.h"
 #include "lwip/sys.h"
 #include <string.h>
@@ -122,13 +122,16 @@ lwip_init_tcp_isn(u32_t boot_time, const u8_t *secret_16_bytes)
  * @param remote_port The remote port number, in host-byte order.
  * @return The ISN to use for the new TCP connection.
  */
+
 u32_t
-lwip_hook_tcp_isn(const ip_addr_t *local_ip, u16_t local_port,
-    const ip_addr_t *remote_ip, u16_t remote_port)
+lwip_hook_tcp_isn(const void *local_ip_ptr, u16_t local_port,
+        const void *remote_ip_ptr, u16_t remote_port)
 {
   lwip_md5_context ctx;
   u8_t output[16];
   u32_t isn;
+  const ip_addr_t *local_ip = local_ip_ptr;
+  const ip_addr_t *remote_ip = remote_ip_ptr;
 
 #if LWIP_IPV4 && LWIP_IPV6
   if (IP_IS_V6(local_ip))

features/FEATURE_LWIP/lwip-interface/lwip-sys/lwip_tcp_isn.h

@@ -30,16 +30,14 @@
 #ifndef LWIP_HDR_CONTRIB_ADDONS_TCP_ISN_H
 #define LWIP_HDR_CONTRIB_ADDONS_TCP_ISN_H
 
-#include "lwip/opt.h"
-#include "lwip/ip_addr.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void lwip_init_tcp_isn(u32_t boot_time, const u8_t *secret_16_bytes);
-u32_t lwip_hook_tcp_isn(const ip_addr_t *local_ip, u16_t local_port,
-                        const ip_addr_t *remote_ip, u16_t remote_port);
+void lwip_init_tcp_isn(uint32_t boot_time, const uint8_t *secret_16_bytes);
+uint32_t lwip_hook_tcp_isn(const void *local_ip, uint16_t local_port,
+                        const void *remote_ip, uint16_t remote_port);
+
 
 #ifdef __cplusplus
 }

features/FEATURE_LWIP/lwip-interface/lwip/CHANGELOG

@@ -15,6 +15,9 @@ HISTORY
 
   ++ Bugfixes:
 
+  2017-01-11: David van Moolenbroek
+  * Lots of IPv6 related fixes and improvements
+
   2017-03-08
   * tcp: do not keep sending SYNs when getting ACKs
 

features/FEATURE_LWIP/lwip-interface/lwip/src/core/ipv4/lwip_ip4.c

@@ -1048,6 +1048,8 @@ ip4_debug_print(struct pbuf *p)
 {
   struct ip_hdr *iphdr = (struct ip_hdr *)p->payload;
 
+  TRACE_TO_ASCII_HEX_DUMPF("IP>", lwip_ntohs(IPH_LEN(iphdr)), (char *) iphdr);
+
   LWIP_DEBUGF(IP_DEBUG, ("IP header:\n"));
   LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
   LWIP_DEBUGF(IP_DEBUG, ("|%2"S16_F" |%2"S16_F" |  0x%02"X16_F" |     %5"U16_F"     | (v, hl, tos, len)\n",

features/FEATURE_LWIP/lwip-interface/lwip/src/core/ipv6/lwip_ip6.c

@@ -72,7 +72,7 @@
  *    this is a tricky case because with multiple netifs, link-local addresses only have
  *    meaning within a particular subnet/link.
  * 3) tries to match the destination subnet to a configured address
- * 4) tries to find a router
+ * 4) tries to find a router-announced route
  * 5) tries to match the source address to the netif
  * 6) returns the default netif, if configured
  *
@@ -134,22 +134,29 @@ ip6_route(const ip6_addr_t *src, const ip6_addr_t *dest)
   }
 #endif
 
-  /* See if the destination subnet matches a configured address. */
+  /* See if the destination subnet matches a configured address. In accordance
+   * with RFC 5942, dynamically configured addresses do not have an implied
+   * local subnet, and thus should be considered /128 assignments. However, as
+   * such, the destination address may still match a local address, and so we
+   * still need to check for exact matches here. By (lwIP) policy, statically
+   * configured addresses do always have an implied local /64 subnet. */
   for (netif = netif_list; netif != NULL; netif = netif->next) {
     if (!netif_is_up(netif) || !netif_is_link_up(netif)) {
       continue;
     }
     for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
       if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-          ip6_addr_netcmp(dest, netif_ip6_addr(netif, i))) {
+          ip6_addr_netcmp(dest, netif_ip6_addr(netif, i)) &&
+          (netif_ip6_addr_isstatic(netif, i) ||
+          ip6_addr_nethostcmp(dest, netif_ip6_addr(netif, i)))) {
         return netif;
       }
     }
   }
 
-  /* Get the netif for a suitable router. */
+  /* Get the netif for a suitable router-announced route. */
   netif = nd6_find_route(dest);
-  if ((netif != NULL) && netif_is_up(netif) && netif_is_link_up(netif)) {
+  if (netif != NULL) {
     return netif;
   }
 
@@ -194,9 +201,22 @@ ip6_route(const ip6_addr_t *src, const ip6_addr_t *dest)
 
 /**
  * @ingroup ip6
- * Select the best IPv6 source address for a given destination
- * IPv6 address. Loosely follows RFC 3484. "Strong host" behavior
- * is assumed.
+ * Select the best IPv6 source address for a given destination IPv6 address.
+ *
+ * This implementation follows RFC 6724 Sec. 5 to the following extent:
+ * - Rules 1, 2, 3: fully implemented
+ * - Rules 4, 5, 5.5: not applicable
+ * - Rule 6: not implemented
+ * - Rule 7: not applicable
+ * - Rule 8: limited to "prefer /64 subnet match over non-match"
+ *
+ * For Rule 2, we deliberately deviate from RFC 6724 Sec. 3.1 by considering
+ * ULAs to be of smaller scope than global addresses, to avoid that a preferred
+ * ULA is picked over a deprecated global address when given a global address
+ * as destination, as that would likely result in broken two-way communication.
+ *
+ * As long as temporary addresses are not supported (as used in Rule 7), a
+ * proper implementation of Rule 8 would obviate the need to implement Rule 6.
  *
  * @param netif the netif on which to send a packet
  * @param dest the destination we are trying to reach
@@ -206,73 +226,72 @@ ip6_route(const ip6_addr_t *src, const ip6_addr_t *dest)
 const ip_addr_t *
 ip6_select_source_address(struct netif *netif, const ip6_addr_t *dest)
 {
-  const ip_addr_t *src = NULL;
-  u8_t i;
-
-  /* If dest is link-local, choose a link-local source. */
-  if (ip6_addr_islinklocal(dest) || ip6_addr_ismulticast_linklocal(dest) || ip6_addr_ismulticast_iflocal(dest)) {
-    for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-      if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-          ip6_addr_islinklocal(netif_ip6_addr(netif, i))) {
-        return netif_ip_addr6(netif, i);
-      }
-    }
+  const ip_addr_t *best_addr;
+  const ip6_addr_t *cand_addr;
+  s8_t dest_scope, cand_scope;
+  s8_t best_scope = IP6_MULTICAST_SCOPE_RESERVED;
+  u8_t i, cand_pref, cand_bits;
+  u8_t best_pref = 0;
+  u8_t best_bits = 0;
+
+  /* Start by determining the scope of the given destination address. These
+   * tests are hopefully (roughly) in order of likeliness to match. */
+  if (ip6_addr_isglobal(dest)) {
+    dest_scope = IP6_MULTICAST_SCOPE_GLOBAL;
+  } else if (ip6_addr_islinklocal(dest) || ip6_addr_isloopback(dest)) {
+    dest_scope = IP6_MULTICAST_SCOPE_LINK_LOCAL;
+  } else if (ip6_addr_isuniquelocal(dest)) {
+    dest_scope = IP6_MULTICAST_SCOPE_ORGANIZATION_LOCAL;
+  } else if (ip6_addr_ismulticast(dest)) {
+    dest_scope = ip6_addr_multicast_scope(dest);
+  } else if (ip6_addr_issitelocal(dest)) {
+    dest_scope = IP6_MULTICAST_SCOPE_SITE_LOCAL;
+  } else {
+    /* no match, consider scope global */
+    dest_scope = IP6_MULTICAST_SCOPE_GLOBAL;
   }
 
-  /* Choose a site-local with matching prefix. */
-  if (ip6_addr_issitelocal(dest) || ip6_addr_ismulticast_sitelocal(dest)) {
-    for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-      if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-          ip6_addr_issitelocal(netif_ip6_addr(netif, i)) &&
-          ip6_addr_netcmp(dest, netif_ip6_addr(netif, i))) {
-        return netif_ip_addr6(netif, i);
-      }
-    }
-  }
+  best_addr = NULL;
 
-  /* Choose a unique-local with matching prefix. */
-  if (ip6_addr_isuniquelocal(dest) || ip6_addr_ismulticast_orglocal(dest)) {
-    for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-      if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-          ip6_addr_isuniquelocal(netif_ip6_addr(netif, i)) &&
-          ip6_addr_netcmp(dest, netif_ip6_addr(netif, i))) {
-        return netif_ip_addr6(netif, i);
-      }
+  for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
+    /* Consider only valid (= preferred and deprecated) addresses. */
+    if (!ip6_addr_isvalid(netif_ip6_addr_state(netif, i))) {
+      continue;
     }
-  }
-
-  /* Choose a global with best matching prefix. */
-  if (ip6_addr_isglobal(dest) || ip6_addr_ismulticast_global(dest)) {
-    for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-      if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-          ip6_addr_isglobal(netif_ip6_addr(netif, i))) {
-        if (src == NULL) {
-          src = netif_ip_addr6(netif, i);
-        }
-        else {
-          /* Replace src only if we find a prefix match. */
-          /* @todo find longest matching prefix. */
-          if ((!(ip6_addr_netcmp(ip_2_ip6(src), dest))) &&
-              ip6_addr_netcmp(netif_ip6_addr(netif, i), dest)) {
-            src = netif_ip_addr6(netif, i);
-          }
-        }
-      }
+    /* Determine the scope of this candidate address. Same ordering idea. */
+    cand_addr = netif_ip6_addr(netif, i);
+    if (ip6_addr_isglobal(cand_addr)) {
+      cand_scope = IP6_MULTICAST_SCOPE_GLOBAL;
+    } else if (ip6_addr_islinklocal(cand_addr)) {
+      cand_scope = IP6_MULTICAST_SCOPE_LINK_LOCAL;
+    } else if (ip6_addr_isuniquelocal(cand_addr)) {
+      cand_scope = IP6_MULTICAST_SCOPE_ORGANIZATION_LOCAL;
+    } else if (ip6_addr_issitelocal(cand_addr)) {
+      cand_scope = IP6_MULTICAST_SCOPE_SITE_LOCAL;
+    } else {
+      /* no match, treat as low-priority global scope */
+      cand_scope = IP6_MULTICAST_SCOPE_RESERVEDF;
     }
-    if (src != NULL) {
-      return src;
+    cand_pref = ip6_addr_ispreferred(netif_ip6_addr_state(netif, i));
+    /* @todo compute the actual common bits, for longest matching prefix. */
+    cand_bits = ip6_addr_netcmp(cand_addr, dest); /* just 1 or 0 for now */
+    if (cand_bits && ip6_addr_nethostcmp(cand_addr, dest)) {
+      return netif_ip_addr6(netif, i); /* Rule 1 */
     }
-  }
-
-  /* Last resort: see if arbitrary prefix matches. */
-  for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-    if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-        ip6_addr_netcmp(dest, netif_ip6_addr(netif, i))) {
-      return netif_ip_addr6(netif, i);
+    if ((best_addr == NULL) || /* no alternative yet */
+        ((cand_scope < best_scope) && (cand_scope >= dest_scope)) ||
+        ((cand_scope > best_scope) && (best_scope < dest_scope)) || /* Rule 2 */
+        ((cand_scope == best_scope) && ((cand_pref > best_pref) || /* Rule 3 */
+        ((cand_pref == best_pref) && (cand_bits > best_bits))))) { /* Rule 8 */
+      /* We found a new "winning" candidate. */
+      best_addr = netif_ip_addr6(netif, i);
+      best_scope = cand_scope;
+      best_pref = cand_pref;
+      best_bits = cand_bits;
     }
   }
 
-  return NULL;
+  return best_addr; /* may be NULL */
 }
 
 #if LWIP_IPV6_FORWARD
@@ -1082,6 +1101,8 @@ ip6_debug_print(struct pbuf *p)
 {
   struct ip6_hdr *ip6hdr = (struct ip6_hdr *)p->payload;
 
+  TRACE_TO_ASCII_HEX_DUMPF("IP>", IP6H_PLEN(ip6hdr) + 40, (char *) ip6hdr);
+
   LWIP_DEBUGF(IP6_DEBUG, ("IPv6 header:\n"));
   LWIP_DEBUGF(IP6_DEBUG, ("+-------------------------------+\n"));
   LWIP_DEBUGF(IP6_DEBUG, ("| %2"U16_F" |  %3"U16_F"  |      %7"U32_F"     | (ver, class, flow)\n",