net: added ng_pktdump module

Makefile.dep

@@ -64,6 +64,10 @@ ifneq (,$(filter ng_netbase,$(USEMODULE)))
   USEMODULE += ng_pktbuf
 endif
 
+ifneq (,$(filter ng_pktdump,$(USEMODULE)))
+  USEMODULE += ng_pktbuf
+endif
+
 ifneq (,$(filter aodvv2,$(USEMODULE)))
   USEMODULE += vtimer
   USEMODULE += sixlowpan

sys/Makefile

@@ -98,6 +98,9 @@ endif
 ifneq (,$(filter ng_nomac,$(USEMODULE)))
     DIRS += net/link_layer/ng_nomac
 endif
+ifneq (,$(filter ng_pktdump,$(USEMODULE)))
+    DIRS += net/crosslayer/ng_pktdump
+endif
 
 DIRS += $(dir $(wildcard $(addsuffix /Makefile, ${USEMODULE})))
 

sys/include/net/ng_pktdump.h

+/*
+ * Copyright (C) 2015 Freie Universität Berlin
+ *
+ * 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.
+ */
+
+/**
+ * @defgroup    net_pktdump Dump Network Packets
+ * @ingroup     net
+ * @brief       Dump network packets to STDOUT for debugging
+ *
+ * @{
+ *
+ * @file
+ * @brief       Interface for a generic network packet dumping module
+ *
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
+ */
+
+#ifndef NG_PKTDUMP_H_
+#define NG_PKTDUMP_H_
+
+#include "kernel.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief   Start the packet dump thread and listening for incoming packets
+ *
+ * @param[in] stack         stack for the packet dump thread
+ * @param[in] stacksize     size of @p stack
+ * @param[in] priority      priority of the packet dump thread
+ * @param[in] name          name for the packet dump thread
+ *
+ * @return                  PID of newly created task on success
+ * @return                  negative value on error
+ */
+kernel_pid_t ng_pktdump_init(char *stack, int stacksize,
+                             char priority, char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NG_PKTDUMP_H_ */
+/** @} */

sys/net/crosslayer/ng_pktdump/Makefile

+include $(RIOTBASE)/Makefile.base

sys/net/crosslayer/ng_pktdump/ng_pktdump.c

+/*
+ * Copyright (C) 2015 Freie Universität Berlin
+ *
+ * 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     net_pktdump
+ * @{
+ *
+ * @file
+ * @brief       Generic module to dump packages received via netapi to STDOUT
+ *
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
+ *
+ * @}
+ */
+
+#include <stdio.h>
+
+#include "thread.h"
+#include "msg.h"
+#include "net/ng_pktdump.h"
+#include "net/ng_netbase.h"
+
+void _dump_type(ng_nettype_t type)
+{
+    switch (type) {
+        case NG_NETTYPE_UNDEF:
+            printf("NETTYPE_UNDEF (%i)", type);
+            break;
+
+#ifdef MODULE_NG_SIXLOWPAN
+        case NG_NETTYPE_SIXLOWPAN:
+            printf("NETTYPE_SIXLOPAN (%i)", type);
+            break;
+#endif
+#ifdef MODULE_NG_IPV6
+        case NG_NETTYPE_IPV6:
+            printf("NETTYPE_IPV6 (%i)", type);
+            break;
+#endif
+#ifdef MODULE_NG_ICMPV6
+        case NG_NETTYPE_ICMPV6:
+            printf("NETTYPE_ICMPV6 (%i)", type);
+            break;
+#endif
+#ifdef MODULE_NG_TCP
+        case NG_NETTYPE_TCP:
+            printf("NETTYPE_TCP (%i)", type);
+            break;
+#endif
+#ifdef MODULE_NG_UDP
+        case NG_NETTYPE_UDP:
+            printf("NETTYPE_UDP (%i)", type);
+            break;
+#endif
+#ifdef TEST_SUITES
+        case NG_NETTYPE_TEST:
+            printf("NETTYPE_TEST (%i)", type);
+            break;
+#endif
+        default:
+            printf("NETTYPE_UNKNOWN (%i)", type);
+            break;
+    }
+}
+
+void _dump(ng_pktsnip_t *pkt)
+{
+    int snips = 0;
+    int size = 0;
+
+    while (pkt != NULL) {
+        printf("~~ SNIP %2i - size: %3i byte, type: ", snips, pkt->size);
+        _dump_type(pkt->type);
+        puts("");
+        ++snips;
+        size += pkt->size;
+        pkt = pkt->next;
+    }
+    printf("~~ PKT    - %2i snips, total size: %3i byte\n", snips, size);
+    ng_pktbuf_release(pkt);
+}
+
+void *_eventloop(void *arg)
+{
+    (void)arg;
+    msg_t msg;
+
+    while (1) {
+        msg_receive(&msg);
+
+        switch (msg.type) {
+            case NG_NETAPI_MSG_TYPE_RCV:
+                puts("PKTDUMP: data received:");
+                _dump((ng_pktsnip_t *)msg.content.ptr);
+                break;
+            case NG_NETAPI_MSG_TYPE_SND:
+                puts("PKTDUMP: data to send:");
+                _dump((ng_pktsnip_t *)msg.content.ptr);
+                break;
+            default:
+                puts("PKTDUMP: received something unexpected");
+                break;
+        }
+    }
+
+    /* never reached */
+    return NULL;
+}
+
+kernel_pid_t ng_pktdump_init(char *stack, int stacksize,
+                             char priority, char *name)
+{
+    return thread_create(stack, stacksize, priority, 0, _eventloop, NULL, name);
+}