Thread DHCP address allocation fix (#1657)

Arto Kinnunen · web-flow · commit f8b227fac181 · 2018-04-17T13:53:17.000+03:00
If Thread network data contains multiple border routers then
global address can be allocated for each prefix. Do not allow
simultaneous DHCP solicits for single prefix.
diff --git a/source/6LoWPAN/Thread/thread_bootstrap.c b/source/6LoWPAN/Thread/thread_bootstrap.c
@@ -1807,7 +1807,7 @@ static void thread_dhcp_client_gua_error_cb(int8_t interface, uint8_t dhcp_addr[
     }
 }
 
-static bool thread_dhcpv6_address_valid(uint8_t *prefixPtr, if_address_list_t *list)
+bool thread_dhcpv6_address_entry_available(uint8_t *prefixPtr, if_address_list_t *list)
 {
     bool addressReady = false;
     ns_list_foreach(if_address_entry_t, entry, list) {
@@ -2501,8 +2501,8 @@ int thread_bootstrap_network_data_process(protocol_interface_info_entry_t *cur,
                                                 memcpy(addr, cur->thread_info->threadPrivatePrefixInfo.ulaPrefix, 8);
                                                 memcpy(&addr[8], ADDR_SHORT_ADR_SUFFIC, 6);
                                                 common_write_16_bit(genericService.routerID, &addr[14]);
-                                                thread_dhcp_client_global_address_delete(cur->id, addr, prefixTlv.Prefix);
                                                 tr_debug("Delete DHCPv6 given address");
+                                                thread_dhcp_client_global_address_delete(cur->id, addr, prefixTlv.Prefix);
                                             }
                                         }
 
@@ -2729,7 +2729,7 @@ void thread_bootstrap_network_prefixes_process(protocol_interface_info_entry_t *
     bool validToLearnRoutes, validToLearOnMeshRoute;
     thread_network_server_data_entry_t *weHostService = NULL;
     uint16_t routerId;
-    tr_debug("Network Data:");
+    tr_debug("Network Data process:");
     routerId = cur->mac_parameters->mac_short_address;
     thread_network_data_cache_entry_t *networkData;
     networkData = &cur->thread_info->networkDataStorage;
@@ -2792,14 +2792,14 @@ void thread_bootstrap_network_prefixes_process(protocol_interface_info_entry_t *
                     }
                 }
 
-                if (!thread_dhcpv6_address_valid(curPrefix->servicesPrefix, &cur->ip_addresses)) {
+                if (!thread_dhcpv6_address_entry_available(curPrefix->servicesPrefix, &cur->ip_addresses)) {
                     thread_addr_write_mesh_local_16(addr, curBorderRouter->routerID, cur->thread_info);
-
+                    /* Do not allow multiple DHCP solicits from one prefix => delete previous */
+                    thread_dhcp_client_global_address_delete(cur->id, NULL, curPrefix->servicesPrefix);
                     if (thread_dhcp_client_get_global_address(cur->id, addr, curPrefix->servicesPrefix, cur->mac, thread_dhcp_client_gua_error_cb) == 0) {
                         tr_debug("GP Address Requested");
                     }
                 }
-
             } else {
                 /* All end device types perform RLOC16 -> 0xfffe
                    replacement if stable network data was requested. */
@@ -2812,7 +2812,7 @@ void thread_bootstrap_network_prefixes_process(protocol_interface_info_entry_t *
             }
 
             if (curBorderRouter->P_preferred) {
-                if (!thread_dhcpv6_address_valid(curPrefix->servicesPrefix, &cur->ip_addresses)) {
+                if (!thread_dhcpv6_address_entry_available(curPrefix->servicesPrefix, &cur->ip_addresses)) {
                     icmpv6_slaac_address_add(cur, curPrefix->servicesPrefix, curPrefix->servicesPrefixLen, 0xffffffff, 0xffffffff, true, SLAAC_IID_DEFAULT);
                 }
             }
diff --git a/source/6LoWPAN/Thread/thread_dhcpv6_client.c b/source/6LoWPAN/Thread/thread_dhcpv6_client.c
@@ -135,6 +135,13 @@ int dhcp_solicit_resp_cb(uint16_t instance_id, void *ptr, uint8_t msg_name,  uin
         tr_error("Sol Not include all Options");
         goto error_exit;
     }
+
+    if (libdhcpv6_nonTemporal_entry_get_by_iaid(dhcp_ia_non_temporal_params.iaId) != srv_data_ptr) {
+        /* Validate server data availability */
+         tr_error("Valid instance not found");
+         goto error_exit;
+     }
+
     if (srv_data_ptr->IAID != dhcp_ia_non_temporal_params.iaId) {
         tr_error("Wrong IAID");
         goto error_exit;
@@ -181,7 +188,9 @@ int thread_dhcp_client_get_global_address(int8_t interface, uint8_t dhcp_addr[st
         tr_error("Invalid parameters");
         return -1;
     }
+
     srv_data_ptr = libdhcvp6_nontemporalAddress_server_data_allocate(interface, dhcp_client.libDhcp_instance, mac64, DHCPV6_DUID_HARDWARE_EUI64_TYPE, prefix, dhcp_addr);
+
     payload_len = libdhcpv6_solication_message_length(DHCPV6_DUID_HARDWARE_EUI64_TYPE, true, 0);
     payload_ptr = ns_dyn_mem_temporary_alloc(payload_len);
 
@@ -207,6 +216,7 @@ int thread_dhcp_client_get_global_address(int8_t interface, uint8_t dhcp_addr[st
     srv_data_ptr->transActionId = dhcp_service_send_req(dhcp_client.service_instance, 0, srv_data_ptr , dhcp_addr, payload_ptr, payload_len, dhcp_solicit_resp_cb);
     return srv_data_ptr->transActionId ? 0 : -1;
 }
+
 void thread_dhcp_client_global_address_renew(int8_t interface)
 {
     // only prepared for changes in thread specifications
@@ -219,15 +229,23 @@ void thread_dhcp_client_global_address_delete(int8_t interface, uint8_t dhcp_add
     protocol_interface_info_entry_t *cur;
     dhcpv6_client_server_data_t *srv_data_ptr;
     (void) dhcp_addr;
+
     srv_data_ptr = libdhcpv6_nonTemporal_entry_get_by_prefix(interface, prefix);
     cur = protocol_stack_interface_info_get_by_id(interface);
-    if (cur == NULL || srv_data_ptr == NULL) {
-        tr_error("Not valid prefix");
-        return;
-    }
-    dhcp_service_req_remove(srv_data_ptr->transActionId);// remove all pending retransmissions
-    addr_delete(cur, srv_data_ptr->iaNontemporalAddress.addressPrefix);
-    libdhcvp6_nontemporalAddress_server_data_free(srv_data_ptr);
+
+    do {
+        if (cur == NULL || srv_data_ptr == NULL) {
+            return;
+        }
+        dhcp_service_req_remove(srv_data_ptr->transActionId);// remove all pending retransmissions
+        tr_debug("Deleting address: %s", trace_ipv6(srv_data_ptr->iaNontemporalAddress.addressPrefix));
+
+        addr_delete(cur, srv_data_ptr->iaNontemporalAddress.addressPrefix);
+
+        libdhcvp6_nontemporalAddress_server_data_free(srv_data_ptr);
+        srv_data_ptr = libdhcpv6_nonTemporal_entry_get_by_prefix(interface, prefix);
+    } while (srv_data_ptr);
+
     return;
 }
 
@@ -306,7 +324,7 @@ void thread_dhcpv6_client_set_address(int8_t interface_id, dhcpv6_client_server_
 
     if (address_entry == NULL) {
         tr_error("Address add failed");
-        return ;
+        return;
     }
     if (renewTimer) {
         // translate seconds to 100ms ticks
@@ -316,7 +334,6 @@ void thread_dhcpv6_client_set_address(int8_t interface_id, dhcpv6_client_server_
             renewTimer = 0xfffffffe;
         }
     }
-    tr_debug("Added new address");
     address_entry->state_timer = renewTimer;
     address_entry->cb = thread_dhcpv6_renew;
 }

Original file line number	Diff line number	Diff line change
`@@ -1807,7 +1807,7 @@ static void thread_dhcp_client_gua_error_cb(int8_t interface, uint8_t dhcp_addr[`
`1807`	`1807`	`}`
`1808`	`1808`	`}`
`1809`	`1809`
`1810`		`-static bool thread_dhcpv6_address_valid(uint8_t prefixPtr, if_address_list_t list)`
	`1810`	`+bool thread_dhcpv6_address_entry_available(uint8_t prefixPtr, if_address_list_t list)`
`1811`	`1811`	`{`
`1812`	`1812`	`bool addressReady = false;`
`1813`	`1813`	`ns_list_foreach(if_address_entry_t, entry, list) {`
`@@ -2501,8 +2501,8 @@ int thread_bootstrap_network_data_process(protocol_interface_info_entry_t *cur,`
`2501`	`2501`	`memcpy(addr, cur->thread_info->threadPrivatePrefixInfo.ulaPrefix, 8);`
`2502`	`2502`	`memcpy(&addr[8], ADDR_SHORT_ADR_SUFFIC, 6);`
`2503`	`2503`	`common_write_16_bit(genericService.routerID, &addr[14]);`
`2504`		`- thread_dhcp_client_global_address_delete(cur->id, addr, prefixTlv.Prefix);`
`2505`	`2504`	`tr_debug("Delete DHCPv6 given address");`
	`2505`	`+ thread_dhcp_client_global_address_delete(cur->id, addr, prefixTlv.Prefix);`
`2506`	`2506`	`}`
`2507`	`2507`	`}`
`2508`	`2508`
`@@ -2729,7 +2729,7 @@ void thread_bootstrap_network_prefixes_process(protocol_interface_info_entry_t *`
`2729`	`2729`	`bool validToLearnRoutes, validToLearOnMeshRoute;`
`2730`	`2730`	`thread_network_server_data_entry_t *weHostService = NULL;`
`2731`	`2731`	`uint16_t routerId;`
`2732`		`- tr_debug("Network Data:");`
	`2732`	`+ tr_debug("Network Data process:");`
`2733`	`2733`	`routerId = cur->mac_parameters->mac_short_address;`
`2734`	`2734`	`thread_network_data_cache_entry_t *networkData;`
`2735`	`2735`	`networkData = &cur->thread_info->networkDataStorage;`
`@@ -2792,14 +2792,14 @@ void thread_bootstrap_network_prefixes_process(protocol_interface_info_entry_t *`
`2792`	`2792`	`}`
`2793`	`2793`	`}`
`2794`	`2794`
`2795`		`- if (!thread_dhcpv6_address_valid(curPrefix->servicesPrefix, &cur->ip_addresses)) {`
	`2795`	`+ if (!thread_dhcpv6_address_entry_available(curPrefix->servicesPrefix, &cur->ip_addresses)) {`
`2796`	`2796`	`thread_addr_write_mesh_local_16(addr, curBorderRouter->routerID, cur->thread_info);`
`2797`		`-`
	`2797`	`+ /* Do not allow multiple DHCP solicits from one prefix => delete previous */`
	`2798`	`+ thread_dhcp_client_global_address_delete(cur->id, NULL, curPrefix->servicesPrefix);`
`2798`	`2799`	`if (thread_dhcp_client_get_global_address(cur->id, addr, curPrefix->servicesPrefix, cur->mac, thread_dhcp_client_gua_error_cb) == 0) {`
`2799`	`2800`	`tr_debug("GP Address Requested");`
`2800`	`2801`	`}`
`2801`	`2802`	`}`
`2802`		`-`
`2803`	`2803`	`} else {`
`2804`	`2804`	`/* All end device types perform RLOC16 -> 0xfffe`
`2805`	`2805`	`replacement if stable network data was requested. */`
`@@ -2812,7 +2812,7 @@ void thread_bootstrap_network_prefixes_process(protocol_interface_info_entry_t *`
`2812`	`2812`	`}`
`2813`	`2813`
`2814`	`2814`	`if (curBorderRouter->P_preferred) {`
`2815`		`- if (!thread_dhcpv6_address_valid(curPrefix->servicesPrefix, &cur->ip_addresses)) {`
	`2815`	`+ if (!thread_dhcpv6_address_entry_available(curPrefix->servicesPrefix, &cur->ip_addresses)) {`
`2816`	`2816`	`icmpv6_slaac_address_add(cur, curPrefix->servicesPrefix, curPrefix->servicesPrefixLen, 0xffffffff, 0xffffffff, true, SLAAC_IID_DEFAULT);`
`2817`	`2817`	`}`
`2818`	`2818`	`}`