added support for multicast forwarding

To prefer correct address on multicast responses the ULA prefix needs
to be removed from RPL when backbone becomes available

Author: Mika Tervonen

source/6LoWPAN/ws/ws_bbr_api.c

@@ -94,7 +94,7 @@ static void ws_bbr_rpl_root_start(uint8_t *dodag_id)
     uint8_t t_flags = PIO_A;
 
     rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, dodag_id, 64, t_flags, 0xffffffff, 0xffffffff, false);
-    rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, dodag_id, 64, 0, 0xffffffff, false);
+    rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, dodag_id, 64, 0x18, 0xffffffff, false);
     rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, NULL, 0, 0, 0xffffffff, false);
 }
 
@@ -147,7 +147,8 @@ static int ws_bbr_static_ula_create(protocol_interface_info_entry_t *cur)
     }
     tr_info("BBR generate ula prefix");
 
-    if_address_entry_t *add_entry = icmpv6_slaac_address_add(cur, static_dodag_prefix, 64, 0xffffffff, 0xffffffff, true, SLAAC_IID_FIXED);
+    // 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, 0, true, SLAAC_IID_FIXED);
     if (!add_entry) {
         return -1;
     }
@@ -239,8 +240,10 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
             // TODO remove old global prefix
             tr_info("RPL GUA deactivate %s", trace_ipv6(global_dodag_id));
 
-            rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, global_dodag_id, 64, 0, 7200, 0, false);
-            rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, global_dodag_id, 64, 0, 7200, false);
+            rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, static_dodag_id, 64, PIO_A, 7200, 7200, false);
+            rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, static_dodag_id, 64, 0x18, 7200, false);
+            rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, global_dodag_id, 64, 0, 7200, 0, true);
+            rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, global_dodag_id, 64, 0, 7200, true);
             ipv6_route_add_with_info(global_dodag_id, 64, backbone_interface_id, NULL, ROUTE_THREAD_BBR, NULL, 0, 7200, 0);
         }
         // TODO add global prefix
@@ -261,8 +264,10 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
             tr_info("RPL GUA activate %s", trace_ipv6(global_id));
             ws_dhcp_client_address_request(cur, global_id, ll);
 
-            rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, global_id, 64, 0, 0xffffffff, 0xffffffff, false);
-            rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, global_id, 64, 0, 0xffffffff, false);
+            rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, static_dodag_id, 64, PIO_A, 7200, 0, false);
+            rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, static_dodag_id, 64, 0x18, 7200, false);
+            rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, global_id, 64, 0, 7200, 7200, false);
+            rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, global_id, 64, 0, 7200, false);
             ipv6_route_add_with_info(global_id, 64, backbone_interface_id, NULL, ROUTE_THREAD_BBR, NULL, 0, 0xffffffff, 0);
         }
         memcpy(global_dodag_id, global_id, 16);

source/RPL/rpl_downward.c

@@ -590,7 +590,7 @@ void rpl_instance_send_address_registration(protocol_interface_info_entry_t *int
 
     aro.status = ARO_SUCCESS;
     aro.present = true;
-    aro.lifetime = addr->preferred_lifetime;
+    aro.lifetime = addr->valid_lifetime;
     memcpy(aro.eui64, interface->mac, 8);
 
     // go through neighbour list, and send to all assigned parents.