Thread advertisement adjustment (ARMmbed#1703)

Thread will not send advertisement when it is attaching.
- trickle time advanced if it has less than 6 seconds remaining when
  starting parent scan
- Bootstrap needs to be in completed state before sending MLE
  advertisement

Author: Arto Kinnunen

source/6LoWPAN/Thread/thread_common.c

@@ -1019,14 +1019,15 @@ void thread_timer(protocol_interface_info_entry_t *cur, uint8_t ticks)
         return;
     }
 
-    if (thread_i_am_router(cur)) {
+    if (cur->nwk_bootstrap_state != ER_BOOTSRAP_DONE && cur->nwk_bootstrap_state != ER_MLE_ATTACH_READY) {
+        /* Own attach is ongoing, do not send advertisements */
+        return;
+    }
 
+    if (thread_i_am_router(cur)) {
         if (thread_routing_timer(thread_info, ticks)) {
             thread_router_bootstrap_mle_advertise(cur);
         }
-
-    } else {
-
     }
 }
 

source/6LoWPAN/Thread/thread_host_bootstrap.c

@@ -285,6 +285,8 @@ void thread_network_attach_start(protocol_interface_info_entry_t *cur)
         tr_debug("MLE Parent request");
         cur->nwk_bootstrap_state = ER_MLE_SCAN;
         cur->bootsrap_state_machine_cnt = 0;
+        /* advance trickle timer by 6 (in 100ms ticks) seconds if needed */
+        thread_routing_trickle_advance(&cur->thread_info->routing, 6*10);
     } else {
         cur->bootsrap_state_machine_cnt = 5;
     }

source/6LoWPAN/Thread/thread_router_bootstrap.c

@@ -2342,6 +2342,13 @@ static void thread_reed_advertisements_cb(void* arg)
     protocol_interface_info_entry_t *cur = arg;
 
     cur->thread_info->routerSelectParameters.reedAdvertisementTimeout = NULL;
+
+    if (cur->nwk_bootstrap_state != ER_BOOTSRAP_DONE && cur->nwk_bootstrap_state != ER_MLE_ATTACH_READY) {
+        /* Own attach is ongoing, try to send advertisement after few seconds */
+        cur->thread_info->routerSelectParameters.reedAdvertisementTimeout = eventOS_timeout_ms(thread_reed_advertisements_cb, 2 * 1000, cur);
+        return;
+    }
+
     if (cur->thread_info->thread_attached_state == THREAD_STATE_CONNECTED &&
             cur->thread_info->thread_device_mode == THREAD_DEVICE_MODE_ROUTER){
         thread_reed_advertise(cur);

source/6LoWPAN/Thread/thread_routing.c

@@ -975,6 +975,21 @@ static void thread_trickle_accelerate(trickle_t *t, const trickle_params_t *para
     }
 }
 
+void thread_routing_trickle_advance(thread_routing_info_t *routing, uint16_t ticks)
+{
+    trickle_t *t =&routing->mle_advert_timer;
+
+    if (!trickle_running(t, &thread_mle_advert_trickle_params)) {
+        return;
+    }
+
+    if ((t->t > t->now) && (t->t - t->now < ticks)) {
+        /* advance trickle elapsing time by number of ticks */
+        t->t = t->t + ticks - (t->t - t->now);
+        tr_debug("trickle advanced to %d, now %d ", t->t, t->now);
+    }
+}
+
 // This functions speeds up next advertisement depending on the disconnect period to leader
 void thread_routing_leader_connection_validate(thread_info_t *thread, uint16_t disconnect_period)
 {

source/6LoWPAN/Thread/thread_routing.h

@@ -187,6 +187,7 @@ void thread_routing_free(thread_routing_info_t *routing);
 void thread_routing_activate(thread_routing_info_t *routing);
 void thread_routing_deactivate(thread_routing_info_t *routing);
 bool thread_routing_timer(struct thread_info_s *thread, uint8_t ticks);
+void thread_routing_trickle_advance(thread_routing_info_t *routing, uint16_t ticks);
 void thread_routing_leader_connection_validate(struct thread_info_s *thread, uint16_t disconnect_period);
 void thread_routing_set_mesh_callbacks(protocol_interface_info_entry_t *cur);
 
@@ -233,6 +234,7 @@ int_fast8_t thread_routing_get_route_data(protocol_interface_info_entry_t *cur,
 #define thread_routing_activate(routing)
 #define thread_routing_deactivate(routing)
 #define thread_routing_timer(thread, ticks) false
+#define thread_routing_trickle_advance(routing, ticks)
 #define thread_routing_leader_connection_validate(thread, disconnect_period)
 #define thread_routing_set_mesh_callbacks(cur)
 #define thread_routing_cost_get_by_router_id(routing, routerId) (0)

test/nanostack/unittest/stub/thread_routing_stub.c

@@ -146,6 +146,10 @@ bool thread_routing_timer(thread_info_t *thread, uint8_t ticks)
     return false;
 }
 
+void thread_routing_trickle_advance(thread_routing_info_t *routing, uint16_t ticks)
+{
+}
+
 void thread_routing_leader_connection_validate(struct thread_info_s *thread, uint16_t disconnect_period)
 {
 }