Update BBR prefix assignment (ARMmbed#1972)

-Do not assign prefix for BBR by default. API should be used to set
 the prefix.
-Add jitter to Thread maintenance timer to avoid burst of messages
 when all timers elapses at the same time.
-Check address availability before generating new domain address to
 avoid regeneration of new address
-Fix misleading traces
-Do not use infinite timeout for domain prefix

Author: Arto Kinnunen

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -2728,7 +2728,7 @@ int thread_bootstrap_network_data_activate(protocol_interface_info_entry_t *cur)
     thread_border_router_network_data_update_notify(cur);
     thread_bbr_network_data_update_notify(cur);
 
-    thread_maintenance_timer_set(cur, THREAD_MAINTENANCE_TIMER_INTERVAL);
+    thread_maintenance_timer_set(cur);
 
     return 0;
 }
@@ -2858,8 +2858,8 @@ void thread_bootstrap_network_prefixes_process(protocol_interface_info_entry_t *
                 if ((cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_HOST ||
                         cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_SLEEPY_HOST) &&
                         cur->thread_info->requestFullNetworkData == false) {
+                    tr_debug("Invalidate router ID: %04x", curBorderRouter->routerID);
                     curBorderRouter->routerID = 0xfffe;
-                    tr_debug("Invalidated router ID: %04x", curBorderRouter->routerID);
                 }
             }
 
@@ -2870,7 +2870,9 @@ void thread_bootstrap_network_prefixes_process(protocol_interface_info_entry_t *
             }
             // generate address based on res1 bit
             if (curBorderRouter->P_res1) {
-                thread_extension_dua_address_generate(cur, curPrefix->servicesPrefix, 64);
+                if (!thread_dhcpv6_address_entry_available(curPrefix->servicesPrefix, &cur->ip_addresses)) {
+                    thread_extension_dua_address_generate(cur, curPrefix->servicesPrefix, 64);
+                }
             }
 
         } // for each borderRouterList

source/6LoWPAN/Thread/thread_common.c

@@ -486,6 +486,7 @@ int thread_info_allocate_and_init(protocol_interface_info_entry_t *cur)
         cur->thread_info->childUpdateReqTimer = -1;
         cur->thread_info->parent_priority = CONNECTIVITY_PP_INVALID; // default invalid - calculated using child count
 
+        thread_maintenance_timer_set(cur);
         thread_routing_init(&cur->thread_info->routing);
         thread_network_local_server_data_base_init(&cur->thread_info->localServerDataBase);
         memset(&cur->thread_info->registered_commissioner, 0, sizeof(thread_commissioner_t));
@@ -962,7 +963,9 @@ static void thread_maintenance_timer(protocol_interface_info_entry_t *cur, uint3
         }
     }
 
-    thread_info(cur)->thread_maintenance_timer = THREAD_MAINTENANCE_TIMER_INTERVAL ;
+    thread_maintenance_timer_set(cur);
+
+    tr_debug("NWK data maintenance scan");
 
     thread_bootstrap_network_data_activate(cur);
 }
@@ -2158,9 +2161,9 @@ void thread_neighbor_communication_update(protocol_interface_info_entry_t *cur,
     thread_neighbor_last_communication_time_update(&cur->thread_info->neighbor_class, neighbor_attribute_index);
 }
 
-void thread_maintenance_timer_set(protocol_interface_info_entry_t *cur, uint16_t delay)
+void thread_maintenance_timer_set(protocol_interface_info_entry_t *cur)
 {
-    thread_info(cur)->thread_maintenance_timer = delay;
+    thread_info(cur)->thread_maintenance_timer = THREAD_MAINTENANCE_TIMER_INTERVAL + randLIB_get_random_in_range(0, THREAD_MAINTENANCE_TIMER_INTERVAL / 10);
 }
 
 #endif

source/6LoWPAN/Thread/thread_common.h

@@ -450,7 +450,7 @@ bool thread_partition_match(protocol_interface_info_entry_t *cur, thread_leader_
 void thread_partition_info_update(protocol_interface_info_entry_t *cur, thread_leader_data_t *leaderData);
 void thread_neighbor_communication_update(protocol_interface_info_entry_t *cur, uint8_t neighbor_attribute_index);
 bool thread_stable_context_check(protocol_interface_info_entry_t *cur, buffer_t *buf);
-void thread_maintenance_timer_set(protocol_interface_info_entry_t *cur, uint16_t delay);
+void thread_maintenance_timer_set(protocol_interface_info_entry_t *cur);
 #else // HAVE_THREAD
 
 NS_DUMMY_DEFINITIONS_OK

source/6LoWPAN/Thread/thread_extension_bbr.c

@@ -950,7 +950,7 @@ static int thread_extension_bbr_dua_cb(int8_t service_id, uint8_t source_address
         ((thread_pbbr_dua_info_t *)route->info.info)->last_contact_time = protocol_core_monotonic_time;
         entry_keep_alive = true;
     }
-    if (thread_bbr_dua_entry_add(this->interface_id, addr_data_ptr, 0xFFFFFFFF, ml_eid_ptr) != 0) {
+    if (thread_bbr_dua_entry_add(this->interface_id, addr_data_ptr, this->dua_timeout * 2, ml_eid_ptr) != 0) {
         bbr_status = THREAD_BBR_STATUS_RESOURCE_SHORTAGE;
         goto send_response;
     }
@@ -1086,13 +1086,16 @@ static int thread_border_router_pbbr_nw_data_register(thread_pbbr_t *this)
         tr_error("Adding service data failed!");
         return -1;
     }
-    thread_border_router_info_t br_info = {0};
-    br_info.P_on_mesh = true;
-    br_info.stableData = true;
-    br_info.P_res1 = true;
-    if (thread_border_router_prefix_add(this->interface_id, this->domain_prefix, 64, &br_info)) {
-        tr_error("Adding domain prefix failed!");
-        return -1;
+
+    if (!addr_is_ipv6_unspecified(this->domain_prefix)) {
+        thread_border_router_info_t br_info = {0};
+        br_info.P_on_mesh = true;
+        br_info.stableData = true;
+        br_info.P_res1 = true;
+        if (thread_border_router_prefix_add(this->interface_id, this->domain_prefix, 64, &br_info)) {
+            tr_error("Adding domain prefix failed!");
+            return -1;
+        }
     }
     return 0;
 }
@@ -1230,14 +1233,7 @@ int8_t thread_extension_bbr_init(int8_t interface_id, int8_t backbone_interface_
     this->joiner_router_rloc = 0xffff;
     this->coap_nmkp_virtual_service_id = -1;
     this->br_bb_service_id = -1;
-    this->domain_prefix[0] = 0xfd;
-    this->domain_prefix[1] = 0x00;
-    this->domain_prefix[2] = 0x7d;
-    this->domain_prefix[3] = 0x03;
-    this->domain_prefix[4] = 0x7d;
-    this->domain_prefix[5] = 0x03;
-    this->domain_prefix[6] = 0x7d;
-    this->domain_prefix[7] = 0x03;
+    memset(this->domain_prefix, 0, sizeof(this->domain_prefix));
     this->coap_service_id = coap_service_initialize(this->interface_id, THREAD_MANAGEMENT_PORT, COAP_SERVICE_OPTIONS_NONE, NULL, NULL);
     if (this->coap_service_id < 0) {
         tr_warn("Thread border router coap init failed");
@@ -1279,7 +1275,6 @@ bool thread_extension_bbr_nd_query_process(protocol_interface_info_entry_t *cur,
     // if we do not have DUA addressing enabled
     if (!bitsequal(this->domain_prefix, target_addr, 64)) {
         return false;
-
     }
 
     // SEND BB_QRY
@@ -1336,18 +1331,18 @@ void thread_extension_bbr_route_update(protocol_interface_info_entry_t *cur)
     if (!this) {
         return;
     }
-    // remove with info and add all valid doman prefixes again to back bone interface
+
+    // remove with info and add valid domain prefix again to back bone interface
     ipv6_route_table_remove_info(this->backbone_interface_id, ROUTE_THREAD_BBR, NULL);
-    // Check if domain prefix is in settings and verify that configuration is made to backbone -> prefix on-link
-    // domain prefix in settings add dua route to backbone, delete dua on-mesh route
-    tr_debug("adding dua on link");
-    ipv6_route_add_with_info(this->domain_prefix, 64, this->backbone_interface_id, NULL, ROUTE_THREAD_BBR, NULL, 0, 0xffffffff, 0);
-    tr_info("Hosting pBBR for DUA prefix");
-    ipv6_route_delete(this->domain_prefix, 64, cur->id, NULL, ROUTE_THREAD);
 
+    if (!addr_is_ipv6_unspecified(this->domain_prefix)) {
+        // add dua route to backbone, delete dua from on-mesh route
+        ipv6_route_add_with_info(this->domain_prefix, 64, this->backbone_interface_id, NULL, ROUTE_THREAD_BBR, NULL, 0, 0xffffffff, 0);
+        tr_info("Hosting pBBR for DUA prefix");
+        ipv6_route_delete(this->domain_prefix, 64, cur->id, NULL, ROUTE_THREAD);
+    }
 }
 
-
 void thread_extension_bbr_seconds_timer(int8_t interface_id, uint32_t seconds)
 {
     thread_pbbr_t *this = thread_bbr_find_by_interface(interface_id);
@@ -1448,14 +1443,17 @@ int thread_extension_bbr_prefix_set(int8_t interface_id, uint8_t *prefix)
         return 0;
     }
 
-    thread_border_router_info_t br_info = {0};
-    br_info.P_on_mesh = true;
-    br_info.stableData = true;
-    br_info.P_res1 = true;
-    if (thread_border_router_prefix_add(this->interface_id, this->domain_prefix, 64, &br_info)) {
-        tr_error("Adding domain prefix failed!");
-        return -1;
+    if (!addr_is_ipv6_unspecified(this->domain_prefix)) {
+        thread_border_router_info_t br_info = {0};
+        br_info.P_on_mesh = true;
+        br_info.stableData = true;
+        br_info.P_res1 = true;
+        if (thread_border_router_prefix_add(this->interface_id, this->domain_prefix, 64, &br_info)) {
+            tr_error("Adding domain prefix failed!");
+            return -1;
+        }
     }
+
     thread_border_router_publish(this->interface_id);
 
     return 0;

source/6LoWPAN/Thread/thread_network_data_storage.c

@@ -1565,14 +1565,12 @@ int thread_nd_local_list_add_service(thread_network_data_cache_entry_t *networkD
  */
 int thread_nd_local_list_add_on_mesh_prefix(thread_network_data_cache_entry_t *networkDataList, thread_prefix_tlv_t *prefixTlv, thread_border_router_tlv_entry_t *service)
 {
-    bool trigDataPropagate = false;
     thread_network_data_prefix_cache_entry_t *prefix_entry;
     thread_network_server_data_entry_t *server_entry;
-    if (service->P_dhcp) {
-        tr_debug("Add DHCPv6 prefix:%s server: %04x", trace_ipv6_prefix(prefixTlv->Prefix, prefixTlv->PrefixLen), service->routerID);
-    } else {
-        tr_debug("Add SLAAC prefix:%s server: %04x", trace_ipv6_prefix(prefixTlv->Prefix, prefixTlv->PrefixLen), service->routerID);
-    }
+    bool trigDataPropagate = false;
+
+    tr_debug("Add %s%s%s prefix:%s server: %04x", service->P_dhcp ? "DHCPv6" : "", service->P_slaac ? "SLAAC " : "", service->P_res1 ? "P_res1 " : "",
+             trace_ipv6_prefix(prefixTlv->Prefix, prefixTlv->PrefixLen), service->routerID);
 
     if (!networkDataList) {
         return -1;
@@ -1634,6 +1632,10 @@ int thread_nd_local_list_add_on_mesh_prefix(thread_network_data_cache_entry_t *n
             trigDataPropagate = true;
         }
 
+        if (server_entry->P_res1 != service->P_res1) {
+            server_entry->P_res1 = service->P_res1;
+            trigDataPropagate = true;
+        }
     }
 
     if (trigDataPropagate) {
@@ -1647,7 +1649,6 @@ int thread_nd_local_list_add_on_mesh_prefix(thread_network_data_cache_entry_t *n
     return 0;
 }
 
-
 /**
  * Del DHCPv6 Server information to route List
  *
@@ -1671,13 +1672,8 @@ int thread_nd_local_list_del_on_mesh_server(thread_network_data_cache_entry_t *n
         return -1;
     }
 
-    if (service->P_dhcp) {
-        tr_debug("Del DHCPv6 server: %s",
-                 trace_array(prefixTlv->Prefix, prefixBits_to_bytes(prefixTlv->PrefixLen)));
-    } else {
-        tr_debug("Del SLAAC server: %s",
-                 trace_array(prefixTlv->Prefix, prefixBits_to_bytes(prefixTlv->PrefixLen)));
-    }
+    tr_debug("Del %s%s%s prefix: %s", service->P_dhcp ? "DHCPv6" : "", service->P_slaac ? "SLAAC " : "", service->P_res1 ? "P_res1 " : "",
+             trace_array(prefixTlv->Prefix, prefixBits_to_bytes(prefixTlv->PrefixLen)));
 
     main_list = thread_prefix_entry_get(&networkDataList->localPrefixList, prefixTlv);
     if (!main_list) {

test/nanostack/unittest/stub/thread_common_stub.c

@@ -413,7 +413,7 @@ bool thread_stable_context_check(protocol_interface_info_entry_t *cur, buffer_t
 }
 
 
-void thread_maintenance_timer_set(protocol_interface_info_entry_t *cur, uint16_t delay)
+void thread_maintenance_timer_set(protocol_interface_info_entry_t *cur)
 {
 
 }