pbbr route handling updated (#1681)

Author: deepakvenugopal

source/6LoWPAN/Thread/thread_bbr_api.c

@@ -755,8 +755,8 @@ bool thread_bbr_routing_enabled(protocol_interface_info_entry_t *cur)
 
 void thread_bbr_network_data_update_notify(protocol_interface_info_entry_t *cur)
 {
-    (void) cur;
     thread_mdns_network_data_update_notify();
+    thread_extension_bbr_route_update(cur);
 }
 #endif /* HAVE_THREAD_BORDER_ROUTER*/
 

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -63,6 +63,7 @@
 #include "6LoWPAN/Thread/thread_network_synch.h"
 #include "6LoWPAN/Thread/thread_joiner_application.h"
 #include "6LoWPAN/Thread/thread_extension.h"
+#include "6LoWPAN/Thread/thread_extension_bbr.h"
 #include "6LoWPAN/Thread/thread_management_client.h"
 #include "6LoWPAN/Thread/thread_address_registration_client.h"
 #include "6LoWPAN/Thread/thread_joiner_application.h"
@@ -681,6 +682,8 @@ int thread_configuration_thread_activate(protocol_interface_info_entry_t *cur, l
 
     thread_extension_activate(cur);
 
+    thread_extension_bbr_route_update(cur);
+
     blacklist_clear();
 
     blacklist_params_set(

source/6LoWPAN/Thread/thread_extension.c

@@ -192,17 +192,11 @@ void thread_extension_network_data_process(struct protocol_interface_info_entry
     }
     // Check if we are the BBR if we are make default route to backend
     if (0 == thread_extension_network_prefix_get(cur->id, NULL, domain_prefix, &domain_prefix_len)) {
-        if(addr_is_assigned_to_interface(cur, addr)) {
-            // pBBR does not have default route to mesh
-            tr_info("Hosting pBBR for DUA prefix");
-            ipv6_route_delete(domain_prefix, domain_prefix_len, cur->id, NULL, ROUTE_THREAD);
-        } else {
-            // Routers and FEDs create on-mesh prefix for domain prefix
-            if (cur->thread_info->thread_device_mode == THREAD_DEVICE_MODE_ROUTER ||
-                    cur->thread_info->thread_device_mode == THREAD_DEVICE_MODE_FULL_END_DEVICE){
-                if (ipv6_route_add(domain_prefix, domain_prefix_len, cur->id, NULL, ROUTE_THREAD, 0xffffffff, 0) == NULL) {
-                    tr_error("fail to add domain prefix route");
-                }
+        // Routers and FEDs create on-mesh prefix for domain prefix
+        if (cur->thread_info->thread_device_mode == THREAD_DEVICE_MODE_ROUTER ||
+            cur->thread_info->thread_device_mode == THREAD_DEVICE_MODE_FULL_END_DEVICE){
+            if (ipv6_route_add(domain_prefix, domain_prefix_len, cur->id, NULL, ROUTE_THREAD, 0xffffffff, 0) == NULL) {
+                tr_error("fail to add domain prefix route");
             }
         }
     }

source/6LoWPAN/Thread/thread_extension_bbr.c

@@ -59,8 +59,7 @@
 
 #include "6LoWPAN/Thread/thread_extension_bbr.h"
 
-#ifdef HAVE_THREAD_V2
-#ifdef HAVE_THREAD_BORDER_ROUTER
+#if defined(HAVE_THREAD_V2) && defined(HAVE_THREAD_BORDER_ROUTER)
 #define TRACE_GROUP "pBBR"
 
 /*
@@ -897,6 +896,8 @@ static int thread_extension_bbr_pbbr_stop(thread_pbbr_t *this)
     multicast_free_address(this->pbbr_multicast_address);
     multicast_fwd_full_for_scope(this->interface_id, IPV6_SCOPE_SITE_LOCAL);
 
+    ipv6_route_table_remove_info(this->backbone_interface_id, ROUTE_THREAD_BBR, NULL);
+
     coap_service_unregister_uri(this->coap_service_id, THREAD_URI_BBR_TRI_RX_NTF);
     coap_service_unregister_uri(this->coap_service_id, THREAD_URI_BBR_NMK_RX_NTF);
     coap_service_unregister_uri(this->coap_service_id, THREAD_URI_BBR_DOMAIN_ADDRESS_REGISTRATION);
@@ -952,7 +953,6 @@ static int thread_extension_bbr_pbbr_start(thread_pbbr_t *this)
     tr_info("pBBR service started (Commercial network)");
     // Register Primary BBR backbone multicast address
     multicast_add_address(this->pbbr_multicast_address, false);
-
     this->pbbr_started = true;
 
     // Register Backbone commercial features
@@ -1062,6 +1062,38 @@ bool thread_extension_bbr_nd_query_process(protocol_interface_info_entry_t *cur,
 
 }
 
+void thread_extension_bbr_route_update(protocol_interface_info_entry_t *cur)
+{
+    // if we have DUA prefix in settings
+    //   if we are pbbr delete dua on-mesh route
+    //   if we are pbbr add dua route to backbone
+    // else
+    // Remove all DUA routes using type
+    uint8_t addr[16];
+    if (0 != thread_extension_primary_bbr_get(cur, addr, NULL, NULL, NULL)) {
+         // BBR not present
+         return;
+    }
+    if(!addr_is_assigned_to_interface(cur, addr)) {
+        return;
+    }
+
+    thread_pbbr_t *this = thread_bbr_find_by_interface(cur->id);
+    if (!this) {
+        return;
+    }
+    // remove with info and add all valid doman prefixes again to back bone interface
+    ipv6_route_table_remove_info(this->backbone_interface_id, ROUTE_THREAD_BBR, NULL);
+    uint8_t domain_prefix[8];
+    // Check if domain prefix is in settings and verify that configuration is made to backbone -> prefix on-link
+    if (0 == thread_extension_network_prefix_get(cur->id, NULL, domain_prefix, NULL)){
+        // 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(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(domain_prefix, 64, cur->id, NULL, ROUTE_THREAD);
+    }
+}
 
 void thread_extension_bbr_seconds_timer(int8_t interface_id, uint32_t seconds)
 {
@@ -1109,6 +1141,7 @@ void thread_extension_bbr_seconds_timer(int8_t interface_id, uint32_t seconds)
             tr_info("pbbr downgraded");
             thread_extension_bbr_pbbr_stop(this);
         }
+
     }
     // Check secondary state if we need to drop
 
@@ -1175,5 +1208,4 @@ int thread_extension_bbr_address_set(int8_t interface_id, const uint8_t *addr_pt
 }
 
 
-#endif //HAVE_THREAD_BORDER_ROUTER
-#endif //HAVE_THREAD_V2
+#endif //HAVE_THREAD_BORDER_ROUTER && HAVE_THREAD_V2

source/6LoWPAN/Thread/thread_extension_bbr.h

@@ -38,13 +38,15 @@
 extern "C" {
 #endif
 
-#ifdef HAVE_THREAD_V2
+#if defined(HAVE_THREAD_V2) && defined(HAVE_THREAD_BORDER_ROUTER)
+
 int8_t thread_extension_bbr_init(int8_t interface_id, int8_t backbone_interface_id);
 void thread_extension_bbr_delete(int8_t interface_id);
 bool thread_extension_bbr_nd_query_process(protocol_interface_info_entry_t *cur, const uint8_t *target_addr, uint16_t rloc);
 void thread_extension_bbr_seconds_timer(int8_t interface_id, uint32_t seconds);
 int thread_extension_bbr_timeout_set(int8_t interface_id, uint32_t timeout_a, uint32_t timeout_b, uint32_t delay);
 int thread_extension_bbr_address_set(int8_t interface_id, const uint8_t *addr_ptr, uint16_t port);
+void thread_extension_bbr_route_update(protocol_interface_info_entry_t *cur);
 
 
 #else
@@ -55,10 +57,11 @@ int thread_extension_bbr_address_set(int8_t interface_id, const uint8_t *addr_pt
 #define thread_extension_bbr_seconds_timer(interface_id, seconds)
 #define thread_extension_bbr_timeout_set(interface_id, timeout_a, timeout_b, delay)
 #define thread_extension_bbr_address_set(interface_id, addr_ptr, port) (-1)
+#define thread_extension_bbr_route_update(cur)
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* THREAD_EXTENSION_BBR_H_ */
+#endif //HAVE_THREAD_BORDER_ROUTER && HAVE_THREAD_V2

source/ipv6_stack/ipv6_routing_table.h

@@ -82,6 +82,7 @@ typedef enum ipv6_route_src {
     ROUTE_THREAD,
     ROUTE_THREAD_BORDER_ROUTER,
     ROUTE_THREAD_PROXIED_HOST,
+    ROUTE_THREAD_BBR,
     ROUTE_REDIRECT,     /* Only occurs in destination cache */
     ROUTE_MAX,
 } ipv6_route_src_t;

test/nanostack/unittest/stub/thread_extension_stub.c

@@ -58,6 +58,11 @@ void thread_extension_primary_bbr_update_done(struct protocol_interface_info_ent
     (void)cur;
 }
 
+void thread_extension_bbr_route_update(protocol_interface_info_entry_t *cur)
+{
+    (void)cur;
+}
+
 void thread_extension_primary_bbr_process(struct protocol_interface_info_entry *cur)
 {
     (void)cur;