Refactor Wi-SUN BBR stop function

Created routing stop for bbr to restart the Border router state machine

Now following functions are always done
Cleanup DHCP server
Cleanup Backbone routes
Delete all generated addressess

Author: Mika Tervonen

source/6LoWPAN/ws/ws_bbr_api.c

@@ -158,16 +158,14 @@ static void ws_bbr_rpl_root_start(protocol_interface_info_entry_t *cur, uint8_t
 
 }
 
+
 static void ws_bbr_rpl_root_stop(void)
 {
     tr_info("RPL root stop");
     if (protocol_6lowpan_rpl_root_dodag) {
         rpl_control_delete_dodag_root(protocol_6lowpan_rpl_domain, protocol_6lowpan_rpl_root_dodag);
         protocol_6lowpan_rpl_root_dodag = NULL;
     }
-    memset(current_local_prefix, 0, 8);
-    memset(current_global_prefix, 0, 8);
-    memset(current_dodag_id, 0, 16);
 }
 
 static int ws_border_router_proxy_validate(int8_t interface_id, uint8_t *address)
@@ -360,6 +358,31 @@ static void ws_bbr_dhcp_server_stop(protocol_interface_info_entry_t *cur, uint8_
 
 }
 
+static void ws_bbr_routing_stop(protocol_interface_info_entry_t *cur)
+{
+    tr_info("BBR routing stop");
+    if (memcmp(current_local_prefix, ADDR_UNSPECIFIED, 8) != 0) {
+        ws_bbr_slaac_remove(cur, current_local_prefix);
+        memset(current_local_prefix, 0, 8);
+    }
+
+    if (memcmp(current_global_prefix, ADDR_UNSPECIFIED, 8) != 0) {
+        ws_bbr_dhcp_server_stop(cur, current_global_prefix);
+        if (backbone_interface_id >= 0) {
+            // Delete route to backbone if it exists
+            ipv6_route_add_with_info(current_global_prefix, 64, backbone_interface_id, NULL, ROUTE_THREAD_BBR, NULL, 0, 0, 0);
+        }
+        memset(current_global_prefix, 0, 8);
+    }
+
+    if (memcmp(current_dodag_id, ADDR_UNSPECIFIED, 8) != 0) {
+        ws_bbr_slaac_remove(cur, current_dodag_id);
+        memset(current_dodag_id, 0, 16);
+    }
+
+    ws_bbr_rpl_root_stop();
+}
+
 static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
 {
 
@@ -389,9 +412,8 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
      */
     if (protocol_interface_address_compare(current_dodag_id) != 0) {
         //DODAGID is lost need to restart
-        tr_warn("DODAGID lost restart RPL");
-        memset(current_dodag_id, 0, 16);
-        ws_bbr_rpl_root_stop();
+        tr_warn("DODAGID lost restart BBR");
+        ws_bbr_routing_stop(cur);
         return;
     }
 
@@ -651,18 +673,11 @@ void ws_bbr_stop(int8_t interface_id)
 {
 #ifdef HAVE_WS_BORDER_ROUTER
 
-    backbone_interface_id = -1;
     protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(interface_id);
 
-    ws_bbr_slaac_remove(cur, current_dodag_id);
-    if (memcmp(current_local_prefix, ADDR_UNSPECIFIED, 8) != 0) {
-        ws_bbr_slaac_remove(cur, current_local_prefix);
-    }
-    if (memcmp(current_global_prefix, ADDR_UNSPECIFIED, 8) != 0) {
-        ws_bbr_dhcp_server_stop(cur, current_global_prefix);
-    }
+    ws_bbr_routing_stop(cur);
 
-    ws_bbr_rpl_root_stop();
+    backbone_interface_id = -1;
     current_instance_id++;
 
 #else
@@ -673,11 +688,12 @@ int ws_bbr_configure(int8_t interface_id, uint16_t options)
 {
 #ifdef HAVE_WS_BORDER_ROUTER
 
-    (void)interface_id;
+    protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(interface_id);
+
     if (protocol_6lowpan_rpl_root_dodag &&
             options != configuration) {
         //Configuration changed delete previous setup
-        ws_bbr_rpl_root_stop();
+        ws_bbr_routing_stop(cur);
     }
     configuration = options;
     return 0;