[SQUASH ME] reverted changes to shell commands

RIOT-OS · Apr 10, 2015 · bbb5a14 · bbb5a14
1 parent d12d1e8
commit bbb5a14
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/sys/shell/commands/sc_fib.c b/sys/shell/commands/sc_fib.c
@@ -71,7 +71,7 @@ int _fib_route_handler(int argc, char **argv)
     /* e.g. fibroute right now dont care about the adress/protocol family */
     if (argc == 1) {
         fib_print_routes();
-        return 0;
+        return;
     }
 
     /* e.g. firoute [add|del] */
@@ -154,6 +154,8 @@ int _fib_route_handler(int argc, char **argv)
             _fib_usage(1);
             return 1;
         }
+
+        return 0;
     }
 
     /* e.g. fibroute add <destination> via <next hop> dev <device> lifetime <lifetime> */
@@ -207,5 +209,4 @@ int _fib_route_handler(int argc, char **argv)
     }
 
     puts("\nunrecognized parameters.\nPlease enter fibroute [add|del] for more information.");
-    return 1;
 }
diff --git a/sys/shell/commands/sc_rpl.c b/sys/shell/commands/sc_rpl.c
@@ -23,11 +23,40 @@
 
 #include "rpl.h"
 
+static char addr_str[IPV6_MAX_ADDR_STR_LEN];
+
 int _rpl_route_handler(int argc, char **argv)
 {
     (void) argc;
     (void) argv;
 
-    puts("DEPRECATED Please use fibroute instead.");
+    rpl_routing_entry_t *rtable;
+    rtable = rpl_get_routing_table();
+    if (rtable) {
+        unsigned c = 0;
+        puts("--------------------------------------------------------------------");
+        puts("Routing table");
+        printf(" %-3s  %-18s  %-18s  %s\n", "#", "target", "next hop", "lifetime");
+        puts("--------------------------------------------------------------------");
+
+        for (int i = 0; i < rpl_max_routing_entries; i++) {
+            if (rtable[i].used) {
+                c++;
+                printf(" %03d: %-18s  ", i, ipv6_addr_to_str(addr_str, IPV6_MAX_ADDR_STR_LEN,
+                                                (&rtable[i].address)));
+                printf("%-18s  ", ipv6_addr_to_str(addr_str, IPV6_MAX_ADDR_STR_LEN,
+                                                (&rtable[i].next_hop)));
+                printf("%d\n", rtable[i].lifetime);
+
+            }
+        }
+        puts("--------------------------------------------------------------------");
+        printf(" %u routing table entries\n", c);
+    }
+    else {
+        puts("No routing table available");
+    }
+    puts("$");
+
     return 0;
 }