From 41312917f8ba3df535531c265bda6ed3a2aa3910 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Fri, 12 Jan 2018 09:18:34 -0800 Subject: [PATCH 1/2] NullNet examples: check paylaod size before reading it --- examples/nullnet/nullnet-broadcast.c | 8 +++++--- examples/nullnet/nullnet-unicast.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/examples/nullnet/nullnet-broadcast.c b/examples/nullnet/nullnet-broadcast.c index d654784eb..9b7108a99 100644 --- a/examples/nullnet/nullnet-broadcast.c +++ b/examples/nullnet/nullnet-broadcast.c @@ -65,9 +65,11 @@ AUTOSTART_PROCESSES(&nullnet_example_process); void input_callback(const void *data, uint16_t len, const linkaddr_t *src, const linkaddr_t *dest) { - LOG_INFO("Received %u from ", *(unsigned *)data); - LOG_INFO_LLADDR(src); - LOG_INFO_("\n"); + if(len == sizeof(unsigned)) { + LOG_INFO("Received %u from ", *(unsigned *)data); + LOG_INFO_LLADDR(src); + LOG_INFO_("\n"); + } } /*---------------------------------------------------------------------------*/ PROCESS_THREAD(nullnet_example_process, ev, data) diff --git a/examples/nullnet/nullnet-unicast.c b/examples/nullnet/nullnet-unicast.c index 98866f381..eb41ac973 100644 --- a/examples/nullnet/nullnet-unicast.c +++ b/examples/nullnet/nullnet-unicast.c @@ -67,9 +67,11 @@ AUTOSTART_PROCESSES(&nullnet_example_process); void input_callback(const void *data, uint16_t len, const linkaddr_t *src, const linkaddr_t *dest) { - LOG_INFO("Received %u from ", *(unsigned *)data); - LOG_INFO_LLADDR(src); - LOG_INFO_("\n"); + if(len == sizeof(unsigned)) { + LOG_INFO("Received %u from ", *(unsigned *)data); + LOG_INFO_LLADDR(src); + LOG_INFO_("\n"); + } } /*---------------------------------------------------------------------------*/ PROCESS_THREAD(nullnet_example_process, ev, data) From 526aad96060f253b31aa92c98c56ea16c5ecb2e9 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Fri, 12 Jan 2018 09:20:14 -0800 Subject: [PATCH 2/2] Disable TSCH HW frame filtering on platform sky --- arch/platform/sky/sky-def.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/platform/sky/sky-def.h b/arch/platform/sky/sky-def.h index 8640892af..0fa6ee29f 100644 --- a/arch/platform/sky/sky-def.h +++ b/arch/platform/sky/sky-def.h @@ -52,6 +52,9 @@ /* Delay between the SFD finishes arriving and it is detected in software */ #define RADIO_DELAY_BEFORE_DETECT 0 +/* Disable TSCH frame filtering */ +#define TSCH_CONF_HW_FRAME_FILTERING 0 + #define PLATFORM_HAS_LEDS 1 #define PLATFORM_HAS_BUTTON 1 #define PLATFORM_HAS_LIGHT 1