DHCPv6 client server address update.

Enabled address update to parent update call for update DHCPv6 client servert address.

Change-Id: Ic197b3c6acfe17a3c070ba2e56905a95d9c99ab6

Author: Juha Heiskanen

nanostack/dhcp_service_api.h

@@ -198,6 +198,15 @@ uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr,
  */
 void dhcp_service_set_retry_timers(uint32_t msg_tr_id, uint16_t timeout_init, uint16_t timeout_max, uint8_t retrans_max);
 
+/**
+ * \brief Update DHCP service server address to active tx process.
+ *
+ * \param msg_tr_id The message transaction ID.
+ * \param server_address New destination address to server / relay Agent.
+ *
+ */
+void dhcp_service_update_server_address(uint32_t msg_tr_id, uint8_t *server_address);
+
 /**
  * \brief Stops transactions for a message (retransmissions).
  *

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1670,7 +1670,7 @@ int ws_bootstrap_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t
     rpl_control_neighbor_delete(cur, ll_address);
     ws_bootstrap_neighbor_remove(cur, ll_address);
     //Cancel DHCPV6 If it is active but not finished yest
-    dhcp_client_address_cancel(cur->id, NULL);
+    //dhcp_client_address_cancel(cur->id, NULL);
     return 0;
 }
 
@@ -2604,6 +2604,11 @@ void ws_primary_parent_update(protocol_interface_info_entry_t *interface, mac_ne
         neighbor_info.neighbor = neighbor;
         neighbor_info.ws_neighbor = ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, neighbor->index);
         ws_bootstrap_primary_parent_set(interface, &neighbor_info, WS_PARENT_HARD_SYNCH);
+        uint8_t link_local_address[16];
+        memcpy(link_local_address, ADDR_LINK_LOCAL_PREFIX, 8);
+        memcpy(link_local_address + 8, neighbor->mac64, 8);
+        link_local_address[8] ^= 2;
+        dhcp_client_server_address_update(interface->id, NULL, link_local_address);
 
         ws_secondary_parent_update(interface);
     }

source/DHCPv6_client/dhcpv6_client_api.h

@@ -100,7 +100,7 @@ void dhcp_client_global_address_delete(int8_t interface, uint8_t *dhcp_addr, uin
 
 void dhcp_relay_agent_enable(int8_t interface, uint8_t border_router_address[static 16]);
 
-int dhcp_client_address_cancel(int8_t interface, uint8_t prefix[static 16]);
+int dhcp_client_server_address_update(int8_t interface, uint8_t prefix[static 16], uint8_t server_address[static 16]);
 
 
 

source/DHCPv6_client/dhcpv6_client_service.c

@@ -303,11 +303,12 @@ int dhcp_client_get_global_address(int8_t interface, uint8_t dhcp_addr[static 16
     return 0;
 }
 
-int dhcp_client_address_cancel(int8_t interface, uint8_t prefix[static 16])
+int dhcp_client_server_address_update(int8_t interface, uint8_t prefix[static 16], uint8_t server_address[static 16])
 {
     dhcpv6_client_server_data_t *srv_data_ptr = NULL;
 
     if (dhcp_client.interface != interface) {
+        tr_debug("Interface not match");
         return -1;
     }
 
@@ -316,11 +317,17 @@ int dhcp_client_address_cancel(int8_t interface, uint8_t prefix[static 16])
     } else if (dhcp_client.one_instance_interface) {
         srv_data_ptr = libdhcpv6_nonTemporal_entry_get_by_instance(dhcp_client.libDhcp_instance);
     }
+    if (srv_data_ptr) {
+        if (memcmp(srv_data_ptr->server_address, server_address, 16) == 0) {
+            return 0;
+        }
+    }
 
-    if (srv_data_ptr && !srv_data_ptr->iaNonTemporalStructValid) {
-        tr_debug("Cancel Address request");
-        dhcp_service_req_remove(srv_data_ptr->transActionId);// remove all pending retransmissions
-        libdhcvp6_nontemporalAddress_server_data_free(srv_data_ptr);
+    if (srv_data_ptr) {
+        memcpy(srv_data_ptr->server_address, server_address, 16);
+        if (!srv_data_ptr->iaNonTemporalStructValid) {
+            dhcp_service_update_server_address(srv_data_ptr->transActionId, server_address);
+        }
         return 0;
     }
     return -1;

source/libDHCPv6/dhcp_service_api.c

@@ -749,6 +749,17 @@ void dhcp_service_set_retry_timers(uint32_t msg_tr_id, uint16_t timeout_init, ui
     return;
 }
 
+void dhcp_service_update_server_address(uint32_t msg_tr_id, uint8_t *server_address)
+{
+    msg_tr_t *msg_tr_ptr;
+    msg_tr_ptr = dhcp_tr_find(msg_tr_id);
+
+    if (msg_tr_ptr != NULL) {
+        tr_debug("Set New Server address %s", trace_ipv6(server_address));
+        memcpy(msg_tr_ptr->addr.address, server_address, 16);
+    }
+}
+
 void dhcp_service_req_remove(uint32_t msg_tr_id)
 {
     if (dhcp_service) {

test/nanostack/unittest/stub/dhcp_service_api_stub.c

@@ -179,3 +179,8 @@ uint8_t  *dhcp_service_relay_global_addres_get(uint16_t instance)
 {
     return NULL;
 }
+
+void dhcp_service_update_server_address(uint32_t msg_tr_id, uint8_t *server_address)
+{
+
+}

test/nanostack/unittest/stub/dhcpv6_client_stub.c

@@ -94,7 +94,7 @@ void dhcp_client_configure(int8_t interface, bool renew_uses_solicit, bool one_c
 
 }
 
-int dhcp_client_address_cancel(int8_t interface, uint8_t prefix[static 16])
+int dhcp_client_server_address_update(int8_t interface, uint8_t prefix[static 16], uint8_t server_address[static 16])
 {
     return 0;
 }