DHCPv6 Client and Server update

Added support for configure DUID to server dynamically after deafult setup which IS DUID-LL

Client support now dynamically Any server DUID mode.

DHCPv6 client support multi instance now and every intance generate default DUID-LL based on user intafce.

Change-Id: I61beed73ab1a96ad83ad9af04471843255a72324

Author: Juha Heiskanen

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -899,7 +899,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_init(cur->id, DHCPV6_DUID_HARDWARE_EUI64_TYPE);
     dhcp_client_configure(cur->id, false, false, false);
     thread_management_client_init(cur->id);
     thread_bootstrap_address_registration_init();
@@ -2886,7 +2886,7 @@ void thread_bootstrap_network_prefixes_process(protocol_interface_info_entry_t *
                     thread_addr_write_mesh_local_16(addr, curBorderRouter->routerID, cur->thread_info);
                     /* Do not allow multiple DHCP solicits from one prefix => delete previous */
                     dhcp_client_global_address_delete(cur->id, NULL, curPrefix->servicesPrefix);
-                    if (dhcp_client_get_global_address(cur->id, addr, curPrefix->servicesPrefix, cur->mac, DHCPV6_DUID_HARDWARE_EUI64_TYPE, thread_dhcp_client_gua_error_cb) == 0) {
+                    if (dhcp_client_get_global_address(cur->id, addr, curPrefix->servicesPrefix, thread_dhcp_client_gua_error_cb) == 0) {
                         tr_debug("GP Address Requested");
                     }
                 }

source/6LoWPAN/ws/ws_bootstrap.c

@@ -761,7 +761,7 @@ static int8_t ws_bootstrap_up(protocol_interface_info_entry_t *cur)
     /*Replace NS handler to disable multicast address queries */
     cur->if_ns_transmit = ws_bootstrap_nd_ns_transmit;
 
-    dhcp_client_init(cur->id);
+    dhcp_client_init(cur->id, DHCPV6_DUID_HARDWARE_IEEE_802_NETWORKS_TYPE);
     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);
 
@@ -2076,7 +2076,7 @@ static void ws_dhcp_client_global_adress_cb(int8_t interface, uint8_t dhcp_addr[
 
 void ws_dhcp_client_address_request(protocol_interface_info_entry_t *cur, uint8_t *prefix, uint8_t *parent_link_local)
 {
-    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) {
+    if (dhcp_client_get_global_address(cur->id, parent_link_local, prefix, ws_dhcp_client_global_adress_cb) != 0) {
         tr_error("DHCPp client request fail");
     }
 }

source/DHCPv6_Server/DHCPv6_Server_service.c

@@ -90,7 +90,11 @@ int DHCPv6_server_respond_client(dhcpv6_gua_server_entry_s *serverBase, dhcpv6_r
     dhcpv6_alloacted_address_entry_t *dhcp_allocated_address;
     dhcpv6_ia_non_temporal_address_s nonTemporalAddress;
     bool address_allocated = false;
-    dhcp_allocated_address = libdhcpv6_address_allocated_list_scan(serverBase, replyPacket->clientDUID.linkID, replyPacket->clientDUID.linkType, dhcp_ia_non_temporal_params->iaId, dhcp_ia_non_temporal_params->T0, dhcp_ia_non_temporal_params->T1, allocateNew);
+    //Validate Client DUID
+    dhcp_link_options_params_t clientDUID;
+    if (libdhcpv6_get_link_address_from_duid(replyPacket->clientDUID.duid, replyPacket->clientDUID.duid_length, replyPacket->clientDUID.type, &clientDUID) == 0) {
+        dhcp_allocated_address = libdhcpv6_address_allocated_list_scan(serverBase, clientDUID.link_id, clientDUID.link_type, dhcp_ia_non_temporal_params->iaId, dhcp_ia_non_temporal_params->T0, dhcp_ia_non_temporal_params->T1, allocateNew);
+    }
     if (dhcp_allocated_address) {
         address_allocated = true;
         nonTemporalAddress.requestedAddress = dhcp_allocated_address->nonTemporalAddress;
@@ -110,7 +114,7 @@ int DHCPv6_server_respond_client(dhcpv6_gua_server_entry_s *serverBase, dhcpv6_r
         }
     }
 
-    response->responseLength = libdhcpv6_address_reply_message_len(replyPacket->clientDUID.linkType, replyPacket->serverDUID.linkType, 0, replyPacket->rapidCommit, address_allocated);
+    response->responseLength = libdhcpv6_address_reply_message_len(replyPacket->clientDUID.duid_length, replyPacket->serverDUID.duid_length, 0, replyPacket->rapidCommit, address_allocated);
     response->responsePtr = ns_dyn_mem_temporary_alloc(response->responseLength);
     if (response->responsePtr) {
         if (address_allocated) {
@@ -141,16 +145,13 @@ int DHCPV6_server_service_request_handler(uint16_t instance_id, uint32_t msg_tr_
                 if (serverBase) {
                     //Here Allocate address
                     replyPacket.rapidCommit = libdhcpv6_rapid_commit_option_at_packet(msg_ptr, msg_len);
-                    replyPacket.serverDUID.linkID = serverBase->serverDUID;
-                    replyPacket.serverDUID.linkType = serverBase->serverLinkType;
+                    replyPacket.serverDUID = serverBase->serverDUID;
                     replyPacket.T0 = dhcp_ia_non_temporal_params.T0;
                     replyPacket.T1 = dhcp_ia_non_temporal_params.T1;
                     replyPacket.iaId = dhcp_ia_non_temporal_params.iaId;
                     replyPacket.transaction_ID = msg_tr_id;
 
-                    uint16_t duid_length = libdhcpv6_duid_option_size(replyPacket.clientDUID.linkType);
-                    duid_length -= 8;
-                    tr_debug("Response dhcp sol %s clientDUID", trace_array(replyPacket.clientDUID.linkID, duid_length));
+                    tr_debug("Response dhcp sol %s clientDUID", trace_array(replyPacket.clientDUID.duid, replyPacket.clientDUID.duid_length));
 
                     //Check First Current list
                     if (DHCPv6_server_respond_client(serverBase, &replyPacket, &dhcp_ia_non_temporal_params, &responseBuf, true) == 0) {
@@ -173,10 +174,7 @@ int DHCPV6_server_service_request_handler(uint16_t instance_id, uint32_t msg_tr_
                 // Discover SERVER
                 serverBase = libdhcpv6_server_data_get_by_prefix_and_socketinstance(instance_id, dhcp_ia_non_temporal_params.nonTemporalAddress);
                 if (serverBase) {
-                    dhcp_link_options_params_t serverInfoDui;
-                    serverInfoDui.linkID = serverBase->serverDUID;
-                    serverInfoDui.linkType = serverBase->serverLinkType;
-                    if (libdhcpv6_compare_DUID(&serverInfoDui, &replyPacket.serverDUID) == 0) {
+                    if (libdhcpv6_compare_DUID(&serverBase->serverDUID, &replyPacket.serverDUID) == 0) {
                         replyPacket.rapidCommit = libdhcpv6_rapid_commit_option_at_packet(msg_ptr, msg_len);
                         replyPacket.T0 = dhcp_ia_non_temporal_params.T0;
                         replyPacket.T1 = dhcp_ia_non_temporal_params.T1;
@@ -339,6 +337,25 @@ void DHCPv6_server_service_callback_set(int8_t interface, uint8_t guaPrefix[stat
     serverInfo->removeCb = remove_cb;
 }
 
+
+int DHCPv6_server_service_duid_update(int8_t interface, uint8_t guaPrefix[static 16],  uint8_t *duid_ptr, uint16_t duid_type, uint8_t duid_length)
+{
+
+    //Validate length and type
+    if (!libdhcpv6_duid_length_validate(duid_type, duid_length)) {
+        return -1;
+    }
+
+
+    dhcpv6_gua_server_entry_s *serverInfo = libdhcpv6_server_data_get_by_prefix_and_interfaceid(interface, guaPrefix);
+    if (!serverInfo) {
+        return -1;
+    }
+
+    return libdhcpv6_server_duid_set(serverInfo, duid_ptr, duid_type, duid_length);
+}
+
+
 /* SET max accepted clients to server, Default is 200
  *
  *

source/DHCPv6_Server/DHCPv6_server_service.h

@@ -45,6 +45,7 @@ int DHCPv6_server_service_init(int8_t interface, uint8_t guaPrefix[static 16], u
 
 void DHCPv6_server_service_callback_set(int8_t interface, uint8_t guaPrefix[static 16], dhcp_address_prefer_remove_cb *remove_cb, dhcp_address_add_notify_cb *add_cb);
 
+int DHCPv6_server_service_duid_update(int8_t interface, uint8_t guaPrefix[static 16],  uint8_t *duid_ptr, uint16_t duid_type, uint8_t duid_length);
 
 /* Delete dhcp thread dhcp router ID server.
  *

source/DHCPv6_client/dhcpv6_client_api.h

@@ -32,9 +32,10 @@
  * if only one thread instance is supported this is needed to call only once.
  *
  * /param interface interface id of this instance.
+ * /param link_type DHCPV6_DUID_HARDWARE_IEEE_802_NETWORKS_TYPE, DHCPV6_DUID_HARDWARE_EUI64_TYPE or DHCPV6_DUID_HARDWARE_EUI48_TYPE
  *
  */
-void dhcp_client_init(int8_t interface);
+void dhcp_client_init(int8_t interface, uint16_t link_type);
 
 /* Set configurations for DHCP client
  *
@@ -72,15 +73,13 @@ void dhcp_client_delete(int8_t interface);
  * /param interface interface where address is got
  * /param dhcp_addr dhcp server ML16 address where address is registered.
  * /param prefix dhcp server ML16 address where address is registered.
- * /param mac64 64 bit mac address for identifieng client.
- * /param link_type Link hardware type.
  * /param error_cb error callback that is called if address cannot be created or becomes invalid.
  * /param register_status true if address registered.
  *
  */
 typedef void (dhcp_client_global_adress_cb)(int8_t interface, uint8_t dhcp_addr[static 16], uint8_t prefix[static 16], bool register_status);
 
-int dhcp_client_get_global_address(int8_t interface, uint8_t dhcp_addr[static 16], uint8_t prefix[static 16], uint8_t mac64[static 8], uint16_t link_type, dhcp_client_global_adress_cb *error_cb);
+int dhcp_client_get_global_address(int8_t interface, uint8_t dhcp_addr[static 16], uint8_t prefix[static 16], dhcp_client_global_adress_cb *error_cb);
 
 /* Renew all leased adddresses might be used when short address changes
  *