Slaac address can be recreated after root stop

bbr_stop will clear all data related to RPL root start
Stops the DHCP server at bbr stop

Author: Mika Tervonen

source/6LoWPAN/ws/ws_bbr_api.c

@@ -175,11 +175,24 @@ int ws_border_router_proxy_state_update(int8_t caller_interface_id, int8_t handl
 
 static if_address_entry_t *ws_bbr_slaac_generate(protocol_interface_info_entry_t *cur, uint8_t *ula_prefix)
 {
-    if_address_entry_t *add_entry = icmpv6_slaac_address_add(cur, ula_prefix, 64, 0xffffffff, 0xffffffff, true, SLAAC_IID_FIXED);
+    if_address_entry_t *add_entry = NULL;
+    const uint8_t *address;
+
+    address = addr_select_with_prefix(cur, ula_prefix, 64, 0);
+    if (address) {
+        // Address already exists for this prefix find the entry
+        add_entry = addr_get_entry(cur, address);
+    }
+
+    if (!add_entry) {
+        add_entry = icmpv6_slaac_address_add(cur, ula_prefix, 64, 0xffffffff, 0xffffffff, true, SLAAC_IID_FIXED);
+    }
     if (!add_entry) {
         tr_err("ula create failed");
         return NULL;
     }
+    // Set the timeouts for this address and policy
+    icmpv6_slaac_prefix_update(cur, ula_prefix, 64, 0xffffffff, 0xffffffff);
     addr_policy_table_add_entry(ula_prefix, 64, 2, WS_NON_PREFFRED_LABEL);
     return add_entry;
 }
@@ -382,6 +395,7 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
 
         if (memcmp(local_prefix, ADDR_UNSPECIFIED, 8) != 0) {
             if (!ws_bbr_slaac_generate(cur, local_prefix)) {
+                // Address creation failed
                 return;
             }
 
@@ -605,8 +619,16 @@ void ws_bbr_stop(int8_t interface_id)
 {
 #ifdef HAVE_WS_BORDER_ROUTER
 
-    (void)interface_id;
     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_rpl_root_stop();
     current_instance_id++;