Merge pull request #2583 from authmillenon/shell/feat/ipv6_nc

shell: add commands to manage neighbor cache manually

sys/shell/commands/Makefile

@@ -61,6 +61,9 @@ endif
 ifneq (,$(filter fib,$(USEMODULE)))
 	SRC += sc_fib.c
 endif
+ifneq (,$(filter ng_ipv6_nc,$(USEMODULE)))
+    SRC += sc_ipv6_nc.c
+endif
 
 # TODO
 # Conditional building not possible at the moment due to

sys/shell/commands/sc_ipv6_nc.c

@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2015 Martine Lenders <mlenders@inf.fu-berlin.de>
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License v2.1. See the file LICENSE in the top level directory for
+ * more details.
+ */
+
+/**
+ * @ingroup     sys_shell_commands.h
+ * @{
+ *
+ * @file
+ *
+ * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
+ */
+
+#include <string.h>
+
+#include "kernel_types.h"
+#include "net/ng_ipv6/addr.h"
+#include "net/ng_ipv6/nc.h"
+#include "net/ng_netif.h"
+#include "thread.h"
+
+/* maximum length of L2 address */
+#define MAX_L2_ADDR_LEN (8U)
+
+static bool _is_iface(kernel_pid_t iface)
+{
+#ifdef MODULE_NG_NETIF
+    size_t numof;
+    kernel_pid_t *ifs = ng_netif_get(&numof);
+
+    for (size_t i = 0; i < numof; i++) {
+        if (ifs[i] == iface) {
+            return true;
+        }
+    }
+
+    return false;
+#else
+    return (thread_get(iface) != NULL);
+#endif
+}
+
+static int _ipv6_nc_add(kernel_pid_t iface, char *ipv6_addr_str,
+                        char *l2_addr_str)
+{
+    ng_ipv6_addr_t ipv6_addr;
+    uint8_t l2_addr[MAX_L2_ADDR_LEN];
+    size_t l2_addr_len;
+
+    if (ng_ipv6_addr_from_str(&ipv6_addr, ipv6_addr_str) == NULL) {
+        puts("error: unable to parse IPv6 address.");
+        return 1;
+    }
+
+    if ((l2_addr_len = ng_netif_addr_from_str(l2_addr, sizeof(l2_addr),
+                       l2_addr_str)) == 0) {
+        puts("error: unable to parse link-layer address.");
+        return 1;
+    }
+
+    if (ng_ipv6_nc_add(iface, &ipv6_addr, l2_addr, l2_addr_len, 0) < 0) {
+        puts("error: unable to add address to neighbor cache.");
+        return 1;
+    }
+
+    printf("success: added IPv6 address %s to neighbor cache\n", ipv6_addr_str);
+    return 0;
+}
+
+static int _ipv6_nc_del(char *ipv6_addr_str)
+{
+    ng_ipv6_addr_t ipv6_addr;
+
+    if (ng_ipv6_addr_from_str(&ipv6_addr, ipv6_addr_str) == NULL) {
+        puts("error: unable to parse IPv6 address.");
+        return 1;
+    }
+
+    ng_ipv6_nc_remove(KERNEL_PID_UNDEF, &ipv6_addr);
+    printf("success: removed %s from neighbor cache\n", ipv6_addr_str);
+
+    return 0;
+}
+
+int _ipv6_nc_manage(int argc, char **argv)
+{
+    if (argc > 2) {
+        if ((argc > 4) && (strcmp("add", argv[1]) == 0)) {
+            kernel_pid_t iface = (kernel_pid_t)atoi(argv[2]);
+
+            if (!_is_iface(iface)) {
+                puts("error: invalid interface given.");
+                return 1;
+            }
+
+            return _ipv6_nc_add(iface, argv[3], argv[4]);
+        }
+
+        if (strcmp("del", argv[1]) == 0) {
+            return _ipv6_nc_del(argv[2]);
+        }
+    }
+
+    printf("usage: %s add <iface pid> <ipv6_addr> <l2_addr>\n"
+           "   or: %s del <ipv6_addr>\n", argv[0], argv[0]);
+    return 1;
+}
+
+/**
+ * @}
+ */

sys/shell/commands/shell_commands.c

@@ -163,6 +163,10 @@ extern int _netif_send(int argc, char **argv);
 extern int _fib_route_handler(int argc, char **argv);
 #endif
 
+#ifdef MODULE_NG_IPV6_NC
+extern int _ipv6_nc_manage(int argc, char **argv);
+#endif
+
 const shell_command_t _shell_command_list[] = {
     {"reboot", "Reboot the node", _reboot_handler},
 #ifdef MODULE_CONFIG
@@ -266,6 +270,9 @@ const shell_command_t _shell_command_list[] = {
 #endif
 #ifdef MODULE_FIB
     {"fibroute", "Manipulate the FIB (info: 'fibroute [add|del]')", _fib_route_handler},
+#endif
+#ifdef MODULE_NG_IPV6_NC
+    {"ncache", "manage neighbor cache by hand", _ipv6_nc_manage },
 #endif
     {NULL, NULL, NULL}
 };