fixed bbr for ULA prefix to real prefix change

removed instances from domain to allow new instance with same dodagid

changed ULA address to be different from ULA prefix

Author: Mika Tervonen

source/6LoWPAN/ws/ws_bbr_api.c

@@ -45,6 +45,8 @@
 
 #define RPL_INSTANCE_ID 1
 
+static uint8_t current_instance_id = RPL_INSTANCE_ID;
+
 #ifdef HAVE_WS_BORDER_ROUTER
 
 #define WS_ULA_LIFETIME 24*3600
@@ -60,7 +62,8 @@
 static int8_t backbone_interface_id = -1; // BBR backbone information
 static uint16_t configuration = 0;
 
-static uint8_t static_dodag_prefix[8] = {0xfd, 0x00, 0x61, 0x72, 0x6d};
+static uint8_t static_dodag_prefix[8] = {0xfd, 0x00, 0x72, 0x83, 0x7e};
+static uint8_t static_dodag_id_prefix[8] = {0xfd, 0x00, 0x61, 0x72, 0x6d};
 static uint8_t current_dodag_id[16] = {0};
 static uint8_t current_local_prefix[8] = {0};
 static uint8_t current_global_prefix[8] = {0};
@@ -120,9 +123,10 @@ static void ws_bbr_rpl_root_start(uint8_t *dodag_id)
     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;
+        current_instance_id++;
     }
 
-    protocol_6lowpan_rpl_root_dodag = rpl_control_create_dodag_root(protocol_6lowpan_rpl_domain, RPL_INSTANCE_ID, dodag_id, &rpl_conf, rpl_conf.min_hop_rank_increase, RPL_GROUNDED | RPL_MODE_NON_STORING | RPL_DODAG_PREF(0));
+    protocol_6lowpan_rpl_root_dodag = rpl_control_create_dodag_root(protocol_6lowpan_rpl_domain, current_instance_id, dodag_id, &rpl_conf, rpl_conf.min_hop_rank_increase, RPL_GROUNDED | RPL_MODE_NON_STORING | RPL_DODAG_PREF(0));
     if (!protocol_6lowpan_rpl_root_dodag) {
         tr_err("RPL dodag init failed");
         return;
@@ -137,6 +141,7 @@ static void ws_bbr_rpl_root_stop(void)
     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;
+        current_instance_id++;
     }
     memset(current_local_prefix, 0, 8);
     memset(current_global_prefix, 0, 8);
@@ -177,14 +182,14 @@ static int ws_bbr_static_dodagid_create(protocol_interface_info_entry_t *cur)
         return 0;
     }
     // This address is only used if no other address available.
-    if_address_entry_t *add_entry = icmpv6_slaac_address_add(cur, static_dodag_prefix, 64, 0xffffffff, 0xffffffff, true, SLAAC_IID_FIXED);
+    if_address_entry_t *add_entry = icmpv6_slaac_address_add(cur, static_dodag_id_prefix, 64, 0xffffffff, 0xffffffff, true, SLAAC_IID_FIXED);
     if (!add_entry) {
         tr_err("dodagid create failed");
         return -1;
     }
     memcpy(current_dodag_id, add_entry->address, 16);
     tr_info("BBR generate DODAGID %s", trace_ipv6(current_dodag_id));
-    addr_policy_table_add_entry(static_dodag_prefix, 64, 2, WS_NON_PREFFRED_LABEL);
+    addr_policy_table_add_entry(static_dodag_id_prefix, 64, 2, WS_NON_PREFFRED_LABEL);
 
     return 0;
 }
@@ -219,7 +224,7 @@ static void ws_bbr_dodag_get(uint8_t *local_prefix_ptr, uint8_t *global_prefix_p
     memset(global_prefix_ptr, 0, 8);
 
     // By default static dodagID prefix is used as local prefix
-    memcpy(local_prefix_ptr, current_dodag_id, 8);
+    memcpy(local_prefix_ptr, static_dodag_prefix, 8);
     ws_bbr_bb_static_prefix_get(local_prefix_ptr);
 
     if (arm_net_address_get(backbone_interface_id, ADDR_IPV6_GP, global_address) != 0) {
@@ -523,7 +528,7 @@ uint16_t ws_bbr_pan_size(protocol_interface_info_entry_t *cur)
         prefix_ptr = current_local_prefix;
     }
 
-    rpl_control_get_instance_dao_target_count(cur->rpl_domain, RPL_INSTANCE_ID, NULL, prefix_ptr, &result);
+    rpl_control_get_instance_dao_target_count(cur->rpl_domain, current_instance_id, NULL, prefix_ptr, &result);
     if (result > 0) {
         // remove the Border router from the PAN size
         result--;
@@ -594,6 +599,7 @@ void ws_bbr_stop(int8_t interface_id)
 
     rpl_control_delete_dodag_root(protocol_6lowpan_rpl_domain, protocol_6lowpan_rpl_root_dodag);
     protocol_6lowpan_rpl_root_dodag = NULL;
+    current_instance_id++;
 
 #else
     (void)interface_id;
@@ -606,7 +612,7 @@ int ws_bbr_configure(int8_t interface_id, uint16_t options)
     (void)interface_id;
     if (protocol_6lowpan_rpl_root_dodag &&
             options != configuration) {
-        //Configuration changed delete previus setup
+        //Configuration changed delete previous setup
         ws_bbr_rpl_root_stop();
     }
     configuration = options;