|
86 | 86 | #include "MPL/mpl.h"
|
87 | 87 | #include "MLE/mle.h"
|
88 | 88 | #include "MLE/mle_tlv.h"
|
89 |
| -#include "thread_dhcpv6_client.h" |
| 89 | +#include "DHCPv6_client/dhcpv6_client_api.h" |
90 | 90 | #include "thread_config.h"
|
91 | 91 | #include "thread_meshcop_lib.h"
|
92 | 92 | #include "multicast_api.h"
|
@@ -890,7 +890,7 @@ void thread_interface_init(protocol_interface_info_entry_t *cur)
|
890 | 890 | {
|
891 | 891 | thread_discovery_reset(cur->id);
|
892 | 892 | thread_routing_set_mesh_callbacks(cur);
|
893 |
| - thread_dhcp_client_init(cur->id); |
| 893 | + dhcp_client_init(cur->id); |
894 | 894 | thread_management_client_init(cur->id);
|
895 | 895 | thread_address_registration_init();
|
896 | 896 | cur->mpl_seed_id_mode = MULTICAST_MPL_SEED_ID_MAC_SHORT;
|
@@ -1837,7 +1837,7 @@ static void thread_dhcp_client_gua_error_cb(int8_t interface, uint8_t dhcp_addr[
|
1837 | 1837 | tr_warn("Address Get fail: %s from: %s", trace_ipv6(prefix), trace_ipv6(dhcp_addr));
|
1838 | 1838 | if (prefix && dhcp_addr) {
|
1839 | 1839 | tr_debug("Delete Current Server data");
|
1840 |
| - thread_dhcp_client_global_address_delete(interface, dhcp_addr, prefix); |
| 1840 | + dhcp_client_global_address_delete(interface, dhcp_addr, prefix); |
1841 | 1841 | }
|
1842 | 1842 | }
|
1843 | 1843 | }
|
@@ -2295,7 +2295,7 @@ void thread_bootstrap_stop(protocol_interface_info_entry_t *cur)
|
2295 | 2295 | thread_leader_service_leader_data_free(cur->thread_info);
|
2296 | 2296 | thread_bootstrap_all_nodes_multicast_unregister(cur);
|
2297 | 2297 | thread_data_base_init(cur->thread_info, cur->id);
|
2298 |
| - thread_dhcp_client_delete(cur->id); |
| 2298 | + dhcp_client_delete(cur->id); |
2299 | 2299 | thread_nd_service_delete(cur->id);
|
2300 | 2300 | thread_child_id_request_entry_clean(cur);
|
2301 | 2301 | thread_registered_mcast_addr_entry_clean(cur);
|
@@ -2544,7 +2544,7 @@ int thread_bootstrap_network_data_process(protocol_interface_info_entry_t *cur,
|
2544 | 2544 | memcpy(&addr[8], ADDR_SHORT_ADR_SUFFIC, 6);
|
2545 | 2545 | common_write_16_bit(genericService.routerID, &addr[14]);
|
2546 | 2546 | tr_debug("Delete DHCPv6 given address");
|
2547 |
| - thread_dhcp_client_global_address_delete(cur->id, addr, prefixTlv.Prefix); |
| 2547 | + dhcp_client_global_address_delete(cur->id, addr, prefixTlv.Prefix); |
2548 | 2548 | }
|
2549 | 2549 | }
|
2550 | 2550 |
|
@@ -2840,8 +2840,8 @@ void thread_bootstrap_network_prefixes_process(protocol_interface_info_entry_t *
|
2840 | 2840 | if (!thread_dhcpv6_address_entry_available(curPrefix->servicesPrefix, &cur->ip_addresses)) {
|
2841 | 2841 | thread_addr_write_mesh_local_16(addr, curBorderRouter->routerID, cur->thread_info);
|
2842 | 2842 | /* Do not allow multiple DHCP solicits from one prefix => delete previous */
|
2843 |
| - thread_dhcp_client_global_address_delete(cur->id, NULL, curPrefix->servicesPrefix); |
2844 |
| - if (thread_dhcp_client_get_global_address(cur->id, addr, curPrefix->servicesPrefix, cur->mac, thread_dhcp_client_gua_error_cb) == 0) { |
| 2843 | + dhcp_client_global_address_delete(cur->id, NULL, curPrefix->servicesPrefix); |
| 2844 | + if (dhcp_client_get_global_address(cur->id, addr, curPrefix->servicesPrefix, cur->mac, thread_dhcp_client_gua_error_cb) == 0) { |
2845 | 2845 | tr_debug("GP Address Requested");
|
2846 | 2846 | }
|
2847 | 2847 | }
|
|
0 commit comments