commit automake build system

[tinyos-2.x.git] / support / sdk / c / blip / driver / serial_tun.c

diff --git a/support/sdk/c/blip/driver/serial_tun.c b/support/sdk/c/blip/driver/serial_tun.c
index 95a751c35315c51b8771b9f3743f6646891020f3..9992aa992e7df538c51772fa0b254bbb60213bd9 100644 (file)
--- a/support/sdk/c/blip/driver/serial_tun.c
+++ b/support/sdk/c/blip/driver/serial_tun.c
@@ -66,24 +66,24 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "TrackFlows.h"
+#include <lib6lowpan/TrackFlows.h>
+#include <lib6lowpan/6lowpan.h>
+#include <lib6lowpan/ip.h>
+#include <lib6lowpan/lib6lowpan.h>
+#include <lib6lowpan/devconf.h>
+#include <lib6lowpan/IEEE154Packet.h>
 
-#include "tun_dev.h"
 #include "serialsource.h"
 #include "serialpacket.h"
 #include "serialprotocol.h"
 #include "sfsource.h"
 
-#include "6lowpan.h"
-#include "ip.h"
-#include "lib6lowpan.h"
-#include "IEEE154.h"
+#include "tun_dev.h"
 #include "routing.h"
-#include "devconf.h"
 #include "logging.h"
 #include "config.h"
 #include "nwstate.h"
-#include "vty.h"
+#include "vty/vty.h"
 
 #define min(a,b) ( (a>b) ? b : a )
 #define max(a,b) ( (a>b) ? a : b )
@@ -1124,11 +1124,12 @@ void print_stats(int fd, int argc, char **argv) {
   VTY_HEAD;
   
   VTY_printf("Up since %s", ctime(&stats.boot_time));
-  VTY_printf("  receive  packets: %lu fragments: %lu bytes: %lu\n",
+  VTY_printf("  receive  packets: %lu fragments: %lu bytes: %lu\r\n",
              stats.rx_pkts, stats.rx_frags, stats.rx_bytes);
-  VTY_printf("  transmit packets: %lu fragments: %lu bytes: %lu\n",
+  VTY_printf("  transmit packets: %lu fragments: %lu bytes: %lu\r\n",
              stats.tx_pkts, stats.tx_frags, stats.tx_bytes);
-  VTY_printf("  forward  packets: %lu\n", stats.fw_pkts);
+  VTY_printf("  forward  packets: %lu\r\n", stats.fw_pkts);
+  VTY_printf("  dag seqno: %hi\r\n", routing_get_seqno());
   VTY_flush();
 }
 
@@ -1277,7 +1278,7 @@ void sh_incr_seqno(int fd, int argc, char **argv) {
 struct vty_cmd vty_cmd_list[] = {{"help", print_help},
                                  {"stats",  print_stats},
                                  {"links", nw_print_links},
-                                 {"route", nw_print_routes},
+                                 {"routes", nw_print_routes},
                                  {"newroutes", nw_test_routes},
                                  {"add", nw_add_sticky_edge},
                                  {"inval", nw_inval_node_sh},