Merge pull request #2068 from ARMmbed/ws_dhcp_update

Wi-sun DHCPV6, RPL DIO forwarding, dhcpv6 client  update

Author: Juha Heiskanen

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -888,6 +888,7 @@ void thread_interface_init(protocol_interface_info_entry_t *cur)
     thread_discovery_reset(cur->id);
     thread_routing_set_mesh_callbacks(cur);
     dhcp_client_init(cur->id);
+    dhcp_client_configure(cur->id, false, false, false);
     thread_management_client_init(cur->id);
     thread_address_registration_init();
     cur->mpl_seed_id_mode = MULTICAST_MPL_SEED_ID_MAC_SHORT;

source/6LoWPAN/ws/ws_bbr_api.c

@@ -302,9 +302,6 @@ static void ws_bbr_dhcp_server_stop(protocol_interface_info_entry_t *cur, uint8_
     tr_debug("DHCP server deactivate %s", trace_ipv6(global_id));
     DHCPv6_server_service_delete(cur->id, global_id, false);
 
-    // Set old addresses to deferred and timeout
-    ws_dhcp_client_address_delete(cur, global_id);
-
 }
 
 static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
@@ -342,9 +339,9 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
             tr_info("RPL GUA deactivate %s", trace_ipv6(global_dodag_id));
 
             // Old backbone information is deleted after 120 seconds
-            rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, NULL, 0, 0, 120, true);
-            rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, global_dodag_id, 64, 0, 120, 0, true);
-            rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, global_dodag_id, 64, 0, 120, true);
+            rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, NULL, 0, 0, 0, true);
+            rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, global_dodag_id, 64, 0, 0, 0, true);
+            rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, global_dodag_id, 64, 0, 0, true);
             ipv6_route_add_with_info(global_dodag_id, 64, backbone_interface_id, NULL, ROUTE_THREAD_BBR, NULL, 0, 120, 0);
 
             ws_bbr_dhcp_server_stop(cur, global_dodag_id);
@@ -369,7 +366,7 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
 
             if (configuration & BBR_GUA_C) {
                 // Add also global prefix and route to RPL
-                rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, global_id, 64, t_flags, 7200, 7200, false);
+                rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, global_id, 64, t_flags, 0, 0, false);
             }
             if (configuration & BBR_GUA_ROUTE) {
                 // Add also global prefix and route to RPL

source/6LoWPAN/ws/ws_bootstrap.c

@@ -171,8 +171,6 @@ static void ws_bootstrap_address_notification_cb(struct protocol_interface_info_
             tr_info("Register ARO");
             ws_bootsrap_event_trig(WS_ADDRESS_ADDED, interface->bootStrapId, ARM_LIB_LOW_PRIORITY_EVENT, NULL);
         }
-    } else {
-        tr_debug("Address notification addr: %s reason: %d", trace_ipv6(addr->address), reason);
     }
 }
 
@@ -725,7 +723,7 @@ static int8_t ws_bootstrap_up(protocol_interface_info_entry_t *cur)
     cur->ipv6_neighbour_cache.send_nud_probes = false;
     cur->ipv6_neighbour_cache.probe_avoided_routers = true;
     dhcp_client_init(cur->id);
-    dhcp_client_configure(cur->id, true); //RENEW uses SOLICIT
+    dhcp_client_configure(cur->id, true, true, true); //RENEW uses SOLICIT, Interface will use 1 instance for address get, IAID address hint is not used.
     dhcp_client_solicit_timeout_set(cur->id, WS_DHCP_SOLICIT_TIMEOUT, WS_DHCP_SOLICIT_MAX_RT, WS_DHCP_SOLICIT_MAX_RC);
 
 
@@ -1815,31 +1813,11 @@ static void ws_dhcp_client_global_adress_cb(int8_t interface, uint8_t dhcp_addr[
     tr_debug("DHCPv6 %s status %u", trace_ipv6(dhcp_addr), register_status);
 }
 
-static bool ws_address_entry_available(uint8_t *prefixPtr, if_address_list_t *list)
-{
-    bool addressReady = false;
-    ns_list_foreach(if_address_entry_t, entry, list) {
-        if (prefixPtr) {
-            if (memcmp(entry->address, prefixPtr, 8) == 0) {
-                addressReady = true;
-                break;
-            }
-        } else {
-            if (entry->source == ADDR_SOURCE_DHCP) {
-                addressReady = true;
-                break;
-            }
-        }
-    }
-    return addressReady;
-}
 
 void ws_dhcp_client_address_request(protocol_interface_info_entry_t *cur, uint8_t *prefix, uint8_t *parent_link_local)
 {
-    if (!ws_address_entry_available(prefix, &cur->ip_addresses)) {
-        if (dhcp_client_get_global_address(cur->id, parent_link_local, prefix, cur->mac, DHCPV6_DUID_HARDWARE_IEEE_802_NETWORKS_TYPE, ws_dhcp_client_global_adress_cb) != 0) {
-            tr_error("DHCPp client request fail");
-        }
+    if (dhcp_client_get_global_address(cur->id, parent_link_local, prefix, cur->mac, DHCPV6_DUID_HARDWARE_IEEE_802_NETWORKS_TYPE, ws_dhcp_client_global_adress_cb) != 0) {
+        tr_error("DHCPp client request fail");
     }
 }
 
@@ -1877,20 +1855,13 @@ static void ws_rpl_prefix_callback(prefix_entry_t *prefix, void *handle, uint8_t
             addr_policy_table_add_entry(prefix->prefix, prefix->prefix_len, 2, WS_NON_PREFFRED_LABEL);
         }
     } else if (prefix->prefix_len) {
-        if (prefix->preftime == 0) {
-            // Delete all pending transactions from DHCP
-            // TODO this also deletes the address even when lifetime would allow it to be present
-            dhcp_client_global_address_delete(cur->id, NULL, prefix->prefix);
-        } else {
-            // Create new address using DHCP
+        // Create new address using DHCP
+        if (parent_link_local) {
             ws_dhcp_client_address_request(cur, prefix->prefix, parent_link_local);
-        }
-        // If we have addresses generated we update the lifetimes always
-        ns_list_foreach(if_address_entry_t, entry, &cur->ip_addresses) {
-            if (entry->prefix_len == prefix->prefix_len && bitsequal(entry->address, prefix->prefix, prefix->prefix_len)) {
-                entry->preferred_lifetime = prefix->preftime;
-                entry->valid_lifetime = prefix->lifetime;
-            }
+        } else {
+            /* Deprecate address and remove client */
+            tr_debug("Prefix invalidation %s", trace_ipv6(prefix->prefix));
+            dhcp_client_global_address_delete(cur->id, NULL, prefix->prefix);
         }
     }
 }

source/Common_Protocols/icmpv6.c

@@ -570,16 +570,8 @@ int icmpv6_slaac_prefix_update(struct protocol_interface_info_entry *cur, const
     //Validate first current list If prefix is already defined adress
     ns_list_foreach_safe(if_address_entry_t, e, &cur->ip_addresses) {
         if (e->source == ADDR_SOURCE_SLAAC && (e->prefix_len == prefix_len) && bitsequal(e->address, prefix_ptr, prefix_len)) {
-            //Update Current lifetimes (see RFC 4862 for rules detail)
-            if (valid_lifetime > (2 * 60 * 60) || valid_lifetime > e->valid_lifetime) {
-                addr_set_valid_lifetime(cur, e, valid_lifetime);
-            } else if (e->valid_lifetime <= (2 * 60 * 60)) {
-                //NOT Update Valid Lifetime
-            } else {
-                addr_set_valid_lifetime(cur, e, 2 * 60 * 60);
-            }
 
-            addr_set_preferred_lifetime(cur, e, preferred_lifetime);
+            addr_lifetime_update(cur, e, valid_lifetime, preferred_lifetime, 2 * 60 * 60);
             ret_val = 0;
         }
     }

source/Common_Protocols/icmpv6_prefix.c

@@ -35,9 +35,11 @@ prefix_entry_t *icmpv6_prefix_add(prefix_list_t *list, const uint8_t *prefixPtr,
 
     entry = icmpv6_prefix_compare(list, prefixPtr, prefix_len);
     if (entry) {
-        entry->options = flags;
-        entry->lifetime = lifeTime;
-        entry->preftime = prefTime;
+        if (flags != 0xff) {
+            entry->options = flags;
+            entry->lifetime = lifeTime;
+            entry->preftime = prefTime;
+        }
         return entry;
     }
 

source/Core/include/ns_address_internal.h

@@ -156,6 +156,7 @@ void addr_fast_timer(struct protocol_interface_info_entry *cur, uint_fast16_t ti
 void addr_slow_timer(struct protocol_interface_info_entry *cur, uint_fast16_t seconds);
 struct if_address_entry *addr_add(struct protocol_interface_info_entry *cur, const uint8_t address[__static 16], uint_fast8_t prefix_len, if_address_source_t source, uint32_t valid_lifetime, uint32_t preferred_lifetime, bool skip_dad);
 int_fast8_t addr_delete(struct protocol_interface_info_entry *cur, const uint8_t address[__static 16]);
+int_fast8_t addr_deprecate(struct protocol_interface_info_entry *cur, const uint8_t address[__static 16]);
 void addr_delete_matching(struct protocol_interface_info_entry *cur, const uint8_t *prefix, uint8_t prefix_len, if_address_source_t source);
 void addr_delete_entry(struct protocol_interface_info_entry *cur, if_address_entry_t *addr);
 void addr_set_non_preferred(struct protocol_interface_info_entry *cur, if_address_source_t source);
@@ -166,6 +167,8 @@ void addr_cb(struct protocol_interface_info_entry *interface, if_address_entry_t
 void addr_set_valid_lifetime(struct protocol_interface_info_entry *interface, if_address_entry_t *entry, uint32_t valid_lifetime);
 void addr_set_preferred_lifetime(struct protocol_interface_info_entry *interface, if_address_entry_t *entry, uint32_t preferred_lifetime);
 
+void addr_lifetime_update(struct protocol_interface_info_entry *interface, if_address_entry_t *address, uint32_t valid_lifetime, uint32_t preferred_lifetime, uint32_t threshold);
+
 int_fast8_t addr_policy_table_add_entry(const uint8_t *prefix, uint8_t len, uint8_t precedence, uint8_t label);
 int_fast8_t addr_policy_table_delete_entry(const uint8_t *prefix, uint8_t len);
 uint8_t addr_len_from_type(addrtype_t addr_type);

source/Core/ns_address_internal.c

@@ -1010,6 +1010,19 @@ int_fast8_t addr_delete(protocol_interface_info_entry_t *cur, const uint8_t addr
     return -1;
 }
 
+int_fast8_t addr_deprecate(protocol_interface_info_entry_t *cur, const uint8_t address[static 16])
+{
+    ns_list_foreach(if_address_entry_t, e, &cur->ip_addresses) {
+        if (memcmp(e->address, address, 16) == 0) {
+            tr_debug("Deprecate address %s", trace_ipv6(e->address));
+            addr_lifetime_update(cur, e, 0, 0, 30 * 60); //Accept max 30 min lifetime
+            return 0;
+        }
+    }
+
+    return -1;
+}
+
 void addr_delete_matching(protocol_interface_info_entry_t *cur, const uint8_t *prefix, uint8_t prefix_len, if_address_source_t source)
 {
     ns_list_foreach_safe(if_address_entry_t, e, &cur->ip_addresses) {
@@ -1099,6 +1112,20 @@ void addr_set_preferred_lifetime(protocol_interface_info_entry_t *interface, if_
     }
 }
 
+void addr_lifetime_update(protocol_interface_info_entry_t *interface, if_address_entry_t *address, uint32_t valid_lifetime, uint32_t preferred_lifetime, uint32_t threshold)
+{
+    //Update Current lifetimes (see RFC 4862 for rules detail)
+    if (valid_lifetime > threshold || valid_lifetime > address->valid_lifetime) {
+        addr_set_valid_lifetime(interface, address, valid_lifetime);
+    } else if (address->valid_lifetime <= threshold) {
+        //NOT Update Valid Lifetime
+    } else {
+        addr_set_valid_lifetime(interface, address, threshold);
+    }
+
+    addr_set_preferred_lifetime(interface, address, preferred_lifetime);
+}
+
 void memswap(uint8_t *restrict a, uint8_t *restrict b, uint_fast8_t len)
 {
     while (len--) {

source/DHCPv6_client/dhcpv6_client_api.h

@@ -38,9 +38,12 @@ void dhcp_client_init(int8_t interface);
 
 /* Set configurations for DHCP client
  *
+ * /param interface Client Inteface ID
  * /param renew_uses_solicit Instead of renew message SOLICIT is used.
+ * /param one_client_for_this_interface True Interface use oneinstance for allocate address
+ * /param no_address_hint IAID use address at Solicit
  */
-void dhcp_client_configure(int8_t interface, bool renew_uses_solicit);
+void dhcp_client_configure(int8_t interface, bool renew_uses_solicit, bool one_client_for_this_interface, bool no_address_hint);
 
 /* Set Timeout parameters for SOLICIT transactions
  *