Merge pull request #816 from kkrentz/contikimac-framer-fix

ContikiMAC framer fix

core/net/mac/contikimac/contikimac-framer.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Fraunhofer Heinrich-Hertz-Institut.
+ * Copyright (c) 2010, Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * This file is part of the Contiki operating system.
+ *
  */
 
 /**
@@ -78,6 +80,12 @@ struct hdr {
   uint8_t len;
 };
 
+/*---------------------------------------------------------------------------*/
+static int
+hdr_length(void)
+{
+  return DECORATED_FRAMER.length() + sizeof(struct hdr);
+}
 /*---------------------------------------------------------------------------*/
 static int
 create(void)
@@ -172,6 +180,7 @@ parse(void)
 }
 /*---------------------------------------------------------------------------*/
 const struct framer contikimac_framer = {
+  hdr_length,
   create,
   create_and_secure,
   parse

core/net/mac/contikimac/contikimac-framer.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Fraunhofer Heinrich-Hertz-Institut.
+ * Copyright (c) 2010, Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * This file is part of the Contiki operating system.
+ *
  */
 
 /**

platform/avr-atmega128rfa1/contiki-conf.h

@@ -243,7 +243,13 @@ typedef unsigned short uip_stats_t;
 #define WITH_PHASE_OPTIMIZATION                0
 #define CONTIKIMAC_CONF_COMPOWER               1
 #define RIMESTATS_CONF_ENABLED                 1
-#define NETSTACK_CONF_FRAMER      framer_802154
+
+#if UIP_CONF_IPV6
+#define NETSTACK_CONF_FRAMER      framer802154
+#else /* UIP_CONF_IPV6 */
+#define NETSTACK_CONF_FRAMER      contikimac_framer
+#endif /* UIP_CONF_IPV6 */
+
 #define NETSTACK_CONF_RADIO       rf230_driver
 #define CHANNEL_802_15_4          26
 /* The radio needs to interrupt during an rtimer interrupt */

platform/avr-raven/contiki-conf.h

@@ -259,7 +259,13 @@ typedef unsigned short uip_stats_t;
 #define WITH_PHASE_OPTIMIZATION                0
 #define CONTIKIMAC_CONF_COMPOWER               1
 #define RIMESTATS_CONF_ENABLED                 1
-#define NETSTACK_CONF_FRAMER      framer_802154
+
+#if UIP_CONF_IPV6
+#define NETSTACK_CONF_FRAMER      framer802154
+#else /* UIP_CONF_IPV6 */
+#define NETSTACK_CONF_FRAMER      contikimac_framer
+#endif /* UIP_CONF_IPV6 */
+
 #define NETSTACK_CONF_RADIO       rf230_driver
 #define CHANNEL_802_15_4          26
 /* The radio needs to interrupt during an rtimer interrupt */

platform/avr-ravenusb/contiki-conf.h

@@ -312,7 +312,13 @@ typedef unsigned short uip_stats_t;
 #define NETSTACK_CONF_MAC         nullmac_driver
 //#define NETSTACK_CONF_MAC         csma_driver
 #define NETSTACK_CONF_RDC         contikimac_driver
-#define NETSTACK_CONF_FRAMER      framer_802154
+
+#if UIP_CONF_IPV6
+#define NETSTACK_CONF_FRAMER      framer802154
+#else /* UIP_CONF_IPV6 */
+#define NETSTACK_CONF_FRAMER      contikimac_framer
+#endif /* UIP_CONF_IPV6 */
+
 #define NETSTACK_CONF_RADIO       rf230_driver
 #define CHANNEL_802_15_4          26
 /* Enable extended mode with autoack, but no csma/autoretry */

platform/cc2538dk/contiki-conf.h

@@ -316,8 +316,12 @@ typedef uint32_t rtimer_clock_t;
 #endif
 
 #ifndef NETSTACK_CONF_FRAMER
+#if UIP_CONF_IPV6
 #define NETSTACK_CONF_FRAMER  framer_802154
-#endif
+#else /* UIP_CONF_IPV6 */
+#define NETSTACK_CONF_FRAMER  contikimac_framer
+#endif /* UIP_CONF_IPV6 */
+#endif /* NETSTACK_CONF_FRAMER */
 
 #define NETSTACK_CONF_RADIO   cc2538_rf_driver
 /** @} */

platform/exp5438/contiki-conf.h

@@ -26,7 +26,11 @@
 #endif /* NETSTACK_CONF_RADIO */
 
 #ifndef NETSTACK_CONF_FRAMER
+#if WITH_UIP6
 #define NETSTACK_CONF_FRAMER  framer_802154
+#else /* WITH_UIP6 */
+#define NETSTACK_CONF_FRAMER  contikimac_framer
+#endif /* WITH_UIP6 */
 #endif /* NETSTACK_CONF_FRAMER */
 
 #ifndef CC2420_CONF_AUTOACK

platform/sky/contiki-conf.h

@@ -26,7 +26,11 @@
 #endif /* NETSTACK_CONF_RADIO */
 
 #ifndef NETSTACK_CONF_FRAMER
+#if WITH_UIP6
 #define NETSTACK_CONF_FRAMER  framer_802154
+#else /* WITH_UIP6 */
+#define NETSTACK_CONF_FRAMER  contikimac_framer
+#endif /* WITH_UIP6 */
 #endif /* NETSTACK_CONF_FRAMER */
 
 #ifndef CC2420_CONF_AUTOACK

platform/z1/contiki-conf.h

@@ -69,7 +69,7 @@
 #define NETSTACK_CONF_MAC     csma_driver
 #define NETSTACK_CONF_RDC     contikimac_driver
 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
-#define NETSTACK_CONF_FRAMER  framer_802154
+#define NETSTACK_CONF_FRAMER  contikimac_framer
 
 #define CC2420_CONF_AUTOACK              1