NSH library: Extend ifconfig to support 6loWPAN. Adapt to some changes in configuration variable usage.

nshlib/nsh.h

@@ -155,8 +155,9 @@
  * domain sockets were enable.
  */
 
-#if !defined(CONFIG_NET_ETHERNET) && !defined(CONFIG_NET_LOOPBACK) && \
+#if !defined(CONFIG_NET_ETHERNET) && !defined(CONFIG_NET_6LOWPAN) && \
-    !defined(CONFIG_NET_SLIP) && !defined(CONFIG_NET_TUN)
+    !defined(CONFIG_NET_LOOPBACK) && !defined(CONFIG_NET_SLIP) && \
+    !defined(CONFIG_NET_TUN)
   /* No link layer protocol is a good indication that there is no network
    * device.
    */

nshlib/nsh_netcmds.c

@@ -79,6 +79,10 @@
 #include <nuttx/net/icmp.h>
 #include <nuttx/net/icmpv6.h>
 
+#ifdef CONFIG_NET_6LOWPAN
+#include <nuttx/net/sixlowpan.h>
+#endif
+
 #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \
    !defined(CONFIG_DISABLE_SIGNALS)
 #  include "netutils/netlib.h"
@@ -744,7 +748,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
   FAR char *gwip = NULL;
   FAR char *mask = NULL;
   FAR char *tmp = NULL;
-#ifdef CONFIG_NET_ETHERNET
+#if defined(CONFIG_NET_ETHERNET) || defined(CONFIG_NET_6LOWPAN)
   FAR char *hw = NULL;
 #endif
 #if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS)
@@ -754,7 +758,12 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
   bool inet6 = false;
 #endif
   bool badarg = false;
+#ifdef CONFIG_NET_ETHERNET
   uint8_t mac[IFHWADDRLEN];
+#endif
+#ifdef CONFIG_NET_6LOWPAN
+  uint8_t nodeaddr[NET_6LOWPAN_RIMEADDR_SIZE];
+#endif
 #if defined(CONFIG_NSH_DHCPC)
   FAR void *handle;
 #endif
@@ -841,7 +850,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 #endif
                 }
 
-#ifdef CONFIG_NET_ETHERNET
+#if defined(CONFIG_NET_ETHERNET) || defined(CONFIG_NET_6LOWPAN)
               /* REVISIT: How will we handle Ethernet and SLIP networks together? */
 
               else if (!strcmp(tmp, "hw"))
@@ -850,7 +859,11 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
                     {
                       hw = argv[i + 1];
                       i++;
+#ifdef CONFIG_NET_ETHERNET
                       badarg = !netlib_ethaddrconv(hw, mac);
+#else
+                      badarg = !netlib_nodeaddrconv(hw, nodeaddr);
+#endif
                     }
                   else
                     {
@@ -883,14 +896,18 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
       return ERROR;
     }
 
-#ifdef CONFIG_NET_ETHERNET
+#if defined(CONFIG_NET_ETHERNET) || defined(CONFIG_NET_6LOWPAN)
   /* Set Hardware Ethernet MAC address */
   /* REVISIT: How will we handle Ethernet and SLIP networks together? */
 
   if (hw)
     {
       ninfo("HW MAC: %s\n", hw);
+#ifdef CONFIG_NET_ETHERNET
       netlib_setmacaddr(intf, mac);
+#else
+      netlib_setnodeaddr(intf, nodeaddr);
+#endif
     }
 #endif
 

nshlib/nsh_netinit.c

@@ -72,6 +72,10 @@
 #  include "netutils/dhcpc.h"
 #endif
 
+#ifdef CONFIG_NET_6LOWPAN
+#  include <nuttx/net/sixlowpan.h>
+#endif
+
 #ifdef CONFIG_NETUTILS_NTPCLIENT
 #  include "netutils/ntpclient.h"
 #endif
@@ -90,9 +94,9 @@
 #if defined(CONFIG_NET_ETHERNET) || defined(CONFIG_NET_6LOWPAN)
 #  define HAVE_MAC 1
 #  if defined(CONFIG_NET_6LOWPAN)
-#    if (CONFIG_NET_6LOWPAN_RIMEADDR_SIZE == 2) && CONFIG_NSH_MACADDR > 0xffff
+#    if !defined(CONFIG_NET_6LOWPAN_RIMEADDR_EXTENDED) && CONFIG_NSH_MACADDR > 0xffff
 #      error Invalid 6loWPAN node address for SIZE == 2
-#    elif (CONFIG_NET_6LOWPAN_RIMEADDR_SIZE == 8) && CONFIG_NSH_MACADDR > 0xffffffffffffffffull
+#    elif defined(CONFIG_NET_6LOWPAN_RIMEADDR_EXTENDED) && CONFIG_NSH_MACADDR > 0xffffffffffffffffull
 #      error Invalid 6loWPAN node address for SIZE == 8
 #    endif
 #  endif
@@ -249,7 +253,7 @@ static void nsh_netinit_configure(void)
 #if defined(CONFIG_NET_ETHERNET)
   uint8_t mac[IFHWADDRLEN];
 #elif defined(CONFIG_NET_6LOWPAN)
-  uint8_t nodeaddr[CONFIG_NET_6LOWPAN_RIMEADDR_SIZE];
+  uint8_t nodeaddr[NET_6LOWPAN_RIMEADDR_SIZE];
 #endif
 #endif
 
@@ -275,10 +279,7 @@ static void nsh_netinit_configure(void)
 #elif defined(CONFIG_NET_6LOWPAN)
   /* Use the configured, fixed MAC address */
 
-#if CONFIG_NET_6LOWPAN_RIMEADDR_SIZE == 2
+#ifdef CONFIG_NET_6LOWPAN_RIMEADDR_EXTENDED
-  nodeaddr[0] = (CONFIG_NSH_MACADDR >> (8 * 1)) & 0xff;
-  nodeaddr[1] = (CONFIG_NSH_MACADDR >> (8 * 0)) & 0xff;
-#elif CONFIG_NET_6LOWPAN_RIMEADDR_SIZE == 8
   nodeaddr[0] = (CONFIG_NSH_MACADDR >> (8 * 7)) & 0xff;
   nodeaddr[1] = (CONFIG_NSH_MACADDR >> (8 * 6)) & 0xff;
   nodeaddr[2] = (CONFIG_NSH_MACADDR >> (8 * 5)) & 0xff;
@@ -287,6 +288,9 @@ static void nsh_netinit_configure(void)
   nodeaddr[5] = (CONFIG_NSH_MACADDR >> (8 * 2)) & 0xff;
   nodeaddr[6] = (CONFIG_NSH_MACADDR >> (8 * 1)) & 0xff;
   nodeaddr[7] = (CONFIG_NSH_MACADDR >> (8 * 0)) & 0xff;
+#else
+  nodeaddr[0] = (CONFIG_NSH_MACADDR >> (8 * 1)) & 0xff;
+  nodeaddr[1] = (CONFIG_NSH_MACADDR >> (8 * 0)) & 0xff;
 #endif
 
   /* Set the 6loWPAN node address */