DHCPc6 client cancel support

ws-bootstrap will cancel dhcpv client if address registration fail and trigger again when learn new parent.

Change-Id: Id99b723c72915b516562ce3c055ce3e2e8a04749

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1668,7 +1668,10 @@ int ws_bootstrap_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t
 {
     blacklist_update(ll_address, false);
     rpl_control_neighbor_delete(cur, ll_address);
-    return ws_bootstrap_neighbor_remove(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);
+    return 0;
 }
 
 static void ws_bootstrap_mac_activate(protocol_interface_info_entry_t *cur, uint16_t channel, uint16_t panid, bool coordinator)

source/DHCPv6_client/dhcpv6_client_api.h

@@ -100,6 +100,8 @@ 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]);
+
 
 
 #endif /* DHCPV6_CLIENT_API_H_ */

source/DHCPv6_client/dhcpv6_client_service.c

@@ -303,6 +303,31 @@ 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])
+{
+    dhcpv6_client_server_data_t *srv_data_ptr = NULL;
+
+    if (dhcp_client.interface != interface) {
+        return -1;
+    }
+
+    if (prefix) {
+        srv_data_ptr = libdhcpv6_nonTemporal_entry_get_by_prefix(interface, prefix);
+    } else if (dhcp_client.one_instance_interface) {
+        srv_data_ptr = libdhcpv6_nonTemporal_entry_get_by_instance(dhcp_client.libDhcp_instance);
+    }
+
+    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);
+        return 0;
+    }
+    return -1;
+}
+
+
+
 void dhcp_client_global_address_renew(int8_t interface)
 {
     (void)interface;

test/nanostack/unittest/stub/dhcpv6_client_stub.c

@@ -93,3 +93,8 @@ 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])
+{
+    return 0;
+}