Merge pull request sics-iot#16 from nfi/sparrow-contiki-update

Updated Contiki to latest upstream

Author: Joakim Eriksson

apps/sparrow-oam/sparrow.h

@@ -45,12 +45,6 @@
 #include <stddef.h>
 #include "sparrow-byteorder.h"
 
-#ifdef SPARROW_CONF_STORE_LOCATIONID_LOCALLY
-#define SPARROW_STORE_LOCATIONID_LOCALLY SPARROW_CONF_STORE_LOCATIONID_LOCALLY
-#else
-#define SPARROW_STORE_LOCATIONID_LOCALLY 1
-#endif /* SPARROW_CONF_STORE_LOCATIONID_LOCALLY */
-
 typedef struct {
   uint8_t id[16];
 } sparrow_id_t;

contiki

@@ -43,14 +43,21 @@
 #include "dev/radio.h"
 #include "dev/watchdog.h"
 
-/*---------------------------------------------------------------------------*/
 #define DEBUG 0
 #if DEBUG
 #include <stdio.h>
 #define PRINTF(...) printf(__VA_ARGS__)
 #else
 #define PRINTF(...)
 #endif
+
+static uint8_t handle_collisions = 1;
+/*---------------------------------------------------------------------------*/
+void
+radio_802154_handle_collisions(int on)
+{
+  handle_collisions = on != 0;
+}
 /*---------------------------------------------------------------------------*/
 int
 radio_802154_rx_buf_is_empty(const struct radio_802154_driver *radio)
@@ -111,6 +118,13 @@ radio_802154_release_readbuf(const struct radio_802154_driver *radio)
          radio->state->write_buf, radio->state->read_buf);
 }
 /*---------------------------------------------------------------------------*/
+void
+radio_802154_clear(const struct radio_802154_driver *radio)
+{
+  /* Drop any buffers */
+  radio->state->read_buf = radio->state->write_buf;
+}
+/*---------------------------------------------------------------------------*/
 /* called from receive Interrupt */
 radio_802154_rf_buffer_t *
 radio_802154_handle_ack(const struct radio_802154_driver *radio,
@@ -225,18 +239,23 @@ radio_802154_transmit(const struct radio_802154_driver *radio, unsigned short to
       break;
     case RADIO_TX_COLLISION:
       /* radio did give up... no transmission */
-      wt = RTIMER_NOW();
-      watchdog_periodic();
-      while(RTIMER_CLOCK_LT(RTIMER_NOW(),
-                            wt + (radio->collision_wait_time << collisions))) {
-      }
-      collisions++;
-      if(collisions > 4) {
-        /* Ok give up this transmission - and continue */
-        collisions = 0;
-        attempts++; /* count 4 fails as an attempt - but not as transmission */
+      if(handle_collisions) {
+        wt = RTIMER_NOW();
+        watchdog_periodic();
+        while(RTIMER_CLOCK_LT(RTIMER_NOW(),
+                              wt + (radio->collision_wait_time << collisions))) {
+        }
+        collisions++;
+        if(collisions > 4) {
+          /* Ok give up this transmission - and continue */
+          collisions = 0;
+          attempts++; /* count 4 fails as an attempt - but not as transmission */
+        }
+        PRINTF("Collision: %d %d\n", collisions, attempts);
+      } else {
+        /* Directly return if collisions should not be handled */
+        return RADIO_TX_COLLISION;
       }
-      PRINTF("Collission: %d %d\n", collisions, attempts);
       ret = RADIO_TX_COLLISION;
       break;
     case RADIO_TX_ERR:
@@ -252,3 +271,4 @@ radio_802154_transmit(const struct radio_802154_driver *radio, unsigned short to
   }
   return ret;
 }
+/*---------------------------------------------------------------------------*/

core/dev/radio-802154-dev.c

@@ -108,11 +108,15 @@ void radio_802154_release_writebuf(const struct radio_802154_driver *radio, uint
 radio_802154_rf_buffer_t *radio_802154_get_readbuf(const struct radio_802154_driver *radio);
 void radio_802154_release_readbuf(const struct radio_802154_driver *radio);
 
+void radio_802154_clear(const struct radio_802154_driver *radio);
+
 /* Will check if the packet is an ACK and if it has a correct sequence no
  * if not - the packet will be buffered */
 radio_802154_rf_buffer_t *radio_802154_handle_ack(const struct radio_802154_driver *radio, const uint8_t *buf, int len);
 
 /* The transmit will transmit with built-in retransmission and ACK handling */
 int radio_802154_transmit(const struct radio_802154_driver *radio, unsigned short total_len);
 
+void radio_802154_handle_collisions(int on);
+
 #endif /* RADIO_802154_DEV_H_ */

core/dev/radio-802154-dev.h

@@ -172,24 +172,45 @@ frame802154_has_panid(frame802154_fcf_t *fcf, int *has_src_pan_id, int *has_dest
   }
 
   if(fcf->frame_version == FRAME802154_IEEE802154E_2012) {
-    /* IEEE 802.15.4e-2012, Table 2a, PAN ID Compression */
-    if(!fcf->panid_compression) {
-      if(fcf->dest_addr_mode) {
-        /* Use destination PAN ID if destination address is present */
-        dest_pan_id = 1;
-      } else if(fcf->src_addr_mode) {
-        /* Only src address, include src PAN ID */
-        src_pan_id = 1;
-      }
-    } else if((fcf->dest_addr_mode == 0) && (fcf->src_addr_mode == 0)) {
-      /* No address included: PAN ID compression flag changes meaning */
+    /*
+     * IEEE 802.15.4-2015
+     * Table 7-2, PAN ID Compression value for frame version 0b10
+     */
+    if((fcf->dest_addr_mode == FRAME802154_NOADDR &&
+        fcf->src_addr_mode == FRAME802154_NOADDR &&
+        fcf->panid_compression == 1) ||
+       (fcf->dest_addr_mode != FRAME802154_NOADDR &&
+        fcf->src_addr_mode == FRAME802154_NOADDR &&
+        fcf->panid_compression == 0) ||
+       (fcf->dest_addr_mode == FRAME802154_LONGADDRMODE &&
+        fcf->src_addr_mode == FRAME802154_LONGADDRMODE &&
+        fcf->panid_compression == 0) ||
+       ((fcf->dest_addr_mode == FRAME802154_SHORTADDRMODE &&
+         fcf->src_addr_mode != FRAME802154_NOADDR) ||
+        (fcf->dest_addr_mode != FRAME802154_NOADDR &&
+         fcf->src_addr_mode == FRAME802154_SHORTADDRMODE)) ){
       dest_pan_id = 1;
     }
+
+    if(fcf->panid_compression == 0 &&
+       ((fcf->dest_addr_mode == FRAME802154_NOADDR &&
+         fcf->src_addr_mode == FRAME802154_LONGADDRMODE) ||
+        (fcf->dest_addr_mode == FRAME802154_NOADDR &&
+         fcf->src_addr_mode == FRAME802154_SHORTADDRMODE) ||
+        (fcf->dest_addr_mode == FRAME802154_SHORTADDRMODE &&
+         fcf->src_addr_mode == FRAME802154_SHORTADDRMODE) ||
+        (fcf->dest_addr_mode == FRAME802154_SHORTADDRMODE &&
+         fcf->src_addr_mode == FRAME802154_LONGADDRMODE) ||
+        (fcf->dest_addr_mode == FRAME802154_LONGADDRMODE &&
+         fcf->src_addr_mode == FRAME802154_SHORTADDRMODE))) {
+      src_pan_id = 1;
+    }
+
   } else {
     /* No PAN ID in ACK */
     if(fcf->frame_type != FRAME802154_ACKFRAME) {
       if(!fcf->panid_compression && fcf->src_addr_mode & 3) {
-        /* If compressed, don't inclue source PAN ID */
+        /* If compressed, don't include source PAN ID */
         src_pan_id = 1;
       }
       if(fcf->dest_addr_mode & 3) {

core/net/mac/frame802154.c

@@ -153,7 +153,8 @@ create_frame(int type, int do_create)
    * Set up the source address using only the long address mode for
    * phase 1.
    */
-  linkaddr_copy((linkaddr_t *)&params.src_addr, &linkaddr_node_addr);
+  linkaddr_copy((linkaddr_t *)&params.src_addr,
+                packetbuf_addr(PACKETBUF_ADDR_SENDER));
 
   params.payload = packetbuf_dataptr();
   params.payload_len = packetbuf_datalen();

core/net/mac/framer-802154.c

@@ -47,9 +47,10 @@
 #include "net/llsec/anti-replay.h"
 #include <string.h>
 
-#if CONTIKI_TARGET_COOJA
+#if CONTIKI_TARGET_COOJA || CONTIKI_TARGET_COOJA_IP64
 #include "lib/simEnvChange.h"
-#endif /* CONTIKI_TARGET_COOJA */
+#include "sys/cooja_mt.h"
+#endif /* CONTIKI_TARGET_COOJA || CONTIKI_TARGET_COOJA_IP64 */
 
 #define DEBUG 0
 #if DEBUG
@@ -198,10 +199,10 @@ send_one_packet(mac_callback_t sent, void *ptr)
           wt = RTIMER_NOW();
           watchdog_periodic();
           while(RTIMER_CLOCK_LT(RTIMER_NOW(), wt + ACK_WAIT_TIME)) {
-#if CONTIKI_TARGET_COOJA
+#if CONTIKI_TARGET_COOJA || CONTIKI_TARGET_COOJA_IP64
             simProcessRunValue = 1;
             cooja_mt_yield();
-#endif /* CONTIKI_TARGET_COOJA */
+#endif /* CONTIKI_TARGET_COOJA || CONTIKI_TARGET_COOJA_IP64 */
           }
 
           ret = MAC_TX_NOACK;
@@ -216,10 +217,10 @@ send_one_packet(mac_callback_t sent, void *ptr)
               watchdog_periodic();
               while(RTIMER_CLOCK_LT(RTIMER_NOW(),
                                     wt + AFTER_ACK_DETECTED_WAIT_TIME)) {
-      #if CONTIKI_TARGET_COOJA
-                  simProcessRunValue = 1;
-                  cooja_mt_yield();
-      #endif /* CONTIKI_TARGET_COOJA */
+#if CONTIKI_TARGET_COOJA || CONTIKI_TARGET_COOJA_IP64
+                simProcessRunValue = 1;
+                cooja_mt_yield();
+#endif /* CONTIKI_TARGET_COOJA || CONTIKI_TARGET_COOJA_IP64 */
               }
             }
 
@@ -235,8 +236,8 @@ send_one_packet(mac_callback_t sent, void *ptr)
               }
             }
           } else {
-	    PRINTF("nullrdc tx noack\n");
-	  }
+            PRINTF("nullrdc tx noack\n");
+          }
         }
         break;
       case RADIO_TX_COLLISION:
@@ -366,6 +367,7 @@ packet_input(void)
     int duplicate = 0;
 
 #if NULLRDC_802154_AUTOACK || NULLRDC_802154_AUTOACK_HW
+#if RDC_WITH_DUPLICATE_DETECTION
     /* Check for duplicate packet. */
     duplicate = mac_sequence_is_duplicate();
     if(duplicate) {
@@ -375,9 +377,9 @@ packet_input(void)
     } else {
       mac_sequence_register_seqno();
     }
+#endif /* RDC_WITH_DUPLICATE_DETECTION */
 #endif /* NULLRDC_802154_AUTOACK */
 
-/* TODO We may want to acknowledge only authentic frames */ 
 #if NULLRDC_SEND_802154_ACK
     {
       frame802154_t info154;

core/net/mac/nullrdc.c

@@ -317,7 +317,7 @@ nullify_parents(rpl_dag_t *dag, rpl_rank_t minimum_rank)
 }
 /*---------------------------------------------------------------------------*/
 static int
-should_send_dao(rpl_instance_t *instance, rpl_dio_t *dio, rpl_parent_t *p)
+should_refresh_routes(rpl_instance_t *instance, rpl_dio_t *dio, rpl_parent_t *p)
 {
   /* if MOP is set to no downward routes no DAO should be sent */
   if(instance->mop == RPL_MOP_NO_DOWNWARD_ROUTES) {
@@ -841,12 +841,16 @@ rpl_select_dag(rpl_instance_t *instance, rpl_parent_t *p)
     PRINTF("RPL: Changed preferred parent, rank changed from %u to %u\n",
   	(unsigned)old_rank, best_dag->rank);
     RPL_STAT(rpl_stats.parent_switch++);
-    if(RPL_IS_STORING(instance) && last_parent != NULL) {
-      /* Send a No-Path DAO to the removed preferred parent. */
-      dao_output(last_parent, RPL_ZERO_LIFETIME);
+    if(RPL_IS_STORING(instance)) {
+      if(last_parent != NULL) {
+        /* Send a No-Path DAO to the removed preferred parent. */
+        dao_output(last_parent, RPL_ZERO_LIFETIME);
+      }
+      /* Trigger DAO transmission from immediate children.
+       * Only for storing mode, see RFC6550 section 9.6. */
+      RPL_LOLLIPOP_INCREMENT(instance->dtsn_out);
     }
     /* The DAO parent set changed - schedule a DAO transmission. */
-    RPL_LOLLIPOP_INCREMENT(instance->dtsn_out);
     rpl_schedule_dao(instance);
     rpl_reset_dio_timer(instance);
 #if DEBUG
@@ -1332,8 +1336,12 @@ rpl_local_repair(rpl_instance_t *instance)
   instance->has_downward_route = 0;
 
   rpl_reset_dio_timer(instance);
-  /* Request refresh of DAO registrations next DIO */
-  RPL_LOLLIPOP_INCREMENT(instance->dtsn_out);
+  if(RPL_IS_STORING(instance)) {
+    /* Request refresh of DAO registrations next DIO. Only for storing mode. In
+     * non-storing mode, non-root nodes increment DTSN only on when their parent do,
+     * or on global repair (see RFC6550 section 9.6.) */
+    RPL_LOLLIPOP_INCREMENT(instance->dtsn_out);
+  }
 
   RPL_STAT(rpl_stats.local_repairs++);
 }
@@ -1622,7 +1630,9 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
 
   /* We don't use route control, so we can have only one official parent. */
   if(dag->joined && p == dag->preferred_parent) {
-    if(should_send_dao(instance, dio, p)) {
+    if(should_refresh_routes(instance, dio, p)) {
+      /* Our parent is requesting a new DAO. Increment DTSN in turn,
+       * in both storing and non-storing mode (see RFC6550 section 9.6.) */
       RPL_LOLLIPOP_INCREMENT(instance->dtsn_out);
       rpl_schedule_dao(instance);
     }

core/net/rpl/rpl-dag.c

@@ -202,14 +202,6 @@ rpl_icmp6_update_nbr_table(uip_ipaddr_t *from, nbr_table_reason_t reason, void *
     }
   }
 
-  if(nbr != NULL) {
-#if UIP_ND6_SEND_NA
-    /* set reachable timer if we added or found the nbr entry - and update
-       neighbor entry to reachable to avoid sending NS/NA, etc.  */
-    stimer_set(&nbr->reachable, UIP_ND6_REACHABLE_TIME / 1000);
-    nbr->state = NBR_REACHABLE;
-#endif /* UIP_ND6_SEND_NA */
-  }
   return nbr;
  }
 /*---------------------------------------------------------------------------*/
@@ -636,15 +628,13 @@ dio_output(rpl_instance_t *instance, uip_ipaddr_t *uc_addr)
 }
 /*---------------------------------------------------------------------------*/
 static void
-dao_input_storing(void)
+dao_input_storing(rpl_instance_t *instance)
 {
 #if RPL_WITH_STORING
   uip_ipaddr_t dao_sender_addr;
   rpl_dag_t *dag;
-  rpl_instance_t *instance;
   unsigned char *buffer;
   uint16_t sequence;
-  uint8_t instance_id;
   uint8_t lifetime;
   uint8_t prefixlen;
   uint8_t flags;
@@ -672,16 +662,8 @@ dao_input_storing(void)
   buffer = UIP_ICMP_PAYLOAD;
   buffer_length = uip_len - uip_l3_icmp_hdr_len;
 
-  pos = 0;
-  instance_id = buffer[pos++];
-
-  instance = rpl_get_instance(instance_id);
-  if(instance == NULL) {
-    PRINTF("RPL: Ignoring a DAO for an unknown RPL instance(%u)\n",
-           instance_id);
-    return;
-  }
-
+  /* Position 0 is the instance id that already been handled */
+  pos = 1;
   lifetime = instance->default_lifetime;
 
   flags = buffer[pos++];
@@ -908,16 +890,14 @@ dao_input_storing(void)
 }
 /*---------------------------------------------------------------------------*/
 static void
-dao_input_nonstoring(void)
+dao_input_nonstoring(rpl_instance_t *instance)
 {
 #if RPL_WITH_NON_STORING
   uip_ipaddr_t dao_sender_addr;
   uip_ipaddr_t dao_parent_addr;
   rpl_dag_t *dag;
-  rpl_instance_t *instance;
   unsigned char *buffer;
   uint16_t sequence;
-  uint8_t instance_id;
   uint8_t lifetime;
   uint8_t prefixlen;
   uint8_t flags;
@@ -936,9 +916,8 @@ dao_input_nonstoring(void)
   buffer = UIP_ICMP_PAYLOAD;
   buffer_length = uip_len - uip_l3_icmp_hdr_len;
 
-  pos = 0;
-  instance_id = buffer[pos++];
-  instance = rpl_get_instance(instance_id);
+  /* Position 0 is the instance id that already been handled */
+  pos = 1;
   lifetime = instance->default_lifetime;
 
   flags = buffer[pos++];
@@ -1031,9 +1010,9 @@ dao_input(void)
   }
 
   if(RPL_IS_STORING(instance)) {
-    dao_input_storing();
+    dao_input_storing(instance);
   } else if(RPL_IS_NON_STORING(instance)) {
-    dao_input_nonstoring();
+    dao_input_nonstoring(instance);
   }
 
  discard: