DHCPv6 client update

Added possibility for clear all pending dhcpv6 request before free whole client class.

Change-Id: Ied5cfb52b3be98489753fb4f21523054d5dd1e31

Author: Juha Heiskanen

nanostack/dhcp_service_api.h

@@ -217,6 +217,16 @@ void dhcp_service_update_server_address(uint32_t msg_tr_id, uint8_t *server_addr
  */
 void dhcp_service_req_remove(uint32_t msg_tr_id);
 
+/**
+ * \brief Stops transactions for a messages (retransmissions).
+ *
+ * Clears off sending retransmissions for a particular message transaction by finding it via its message class pointer.
+ *
+ * \param msg_class_ptr The message class pointer.
+ *
+ */
+void dhcp_service_req_remove_all(void *msg_class_ptr);
+
 /**
  * \brief Timer tick function for retransmissions.
  *

source/DHCPv6_client/dhcpv6_client_service.c

@@ -111,7 +111,7 @@ void dhcp_client_delete(int8_t interface)
         if (srv_data_ptr != NULL) {
             tr_debug("Free DHCPv6 Client\n");
             memcpy(temporary_address, srv_data_ptr->iaNontemporalAddress.addressPrefix, 16);
-            dhcp_service_req_remove(srv_data_ptr->transActionId);// remove all pending retransmissions
+            dhcp_service_req_remove_all(srv_data_ptr);// remove all pending retransmissions
             libdhcvp6_nontemporalAddress_server_data_free(srv_data_ptr);
             addr_delete(cur, temporary_address);
 
@@ -359,7 +359,7 @@ void dhcp_client_global_address_delete(int8_t interface, uint8_t *dhcp_addr, uin
         return;
     }
 
-    dhcp_service_req_remove(srv_data_ptr->transActionId);// remove all pending retransmissions
+    dhcp_service_req_remove_all(srv_data_ptr);// remove all pending retransmissions
     if (dhcp_client.one_instance_interface) {
         addr_deprecate(cur, srv_data_ptr->iaNontemporalAddress.addressPrefix);
     } else {
@@ -386,7 +386,7 @@ void dhcpv6_renew(protocol_interface_info_entry_t *interface, if_address_entry_t
         return;
     }
     if (reason == ADDR_CALLBACK_INVALIDATED) {
-        dhcp_service_req_remove(srv_data_ptr->transActionId);//stop retransmissions of renew
+        dhcp_service_req_remove_all(srv_data_ptr);// remove all pending retransmissions
         libdhcvp6_nontemporalAddress_server_data_free(srv_data_ptr);
         tr_warn("Dhcp address lost");
         return;

source/libDHCPv6/dhcp_service_api.c

@@ -767,6 +767,17 @@ void dhcp_service_req_remove(uint32_t msg_tr_id)
     return;
 }
 
+void dhcp_service_req_remove_all(void *msg_class_ptr)
+{
+    if (dhcp_service) {
+        ns_list_foreach_safe(msg_tr_t, cur_ptr, &dhcp_service->tr_list) {
+            if (cur_ptr->client_obj_ptr == msg_class_ptr) {
+                dhcp_tr_delete(cur_ptr);
+            }
+        }
+    }
+}
+
 void dhcp_service_send_message(msg_tr_t *msg_tr_ptr)
 {
     int8_t retval;
@@ -930,4 +941,9 @@ bool dhcp_service_timer_tick(uint16_t ticks)
     return false;
 }
 
+void dhcp_service_req_remove_all(void *msg_class_ptr)
+{
+    (void)msg_class_ptr;
+}
+
 #endif

test/nanostack/unittest/stub/dhcp_service_api_stub.c

@@ -160,6 +160,10 @@ void dhcp_service_req_remove(uint32_t msg_tr_id)
 {
 }
 
+void dhcp_service_req_remove_all(void *msg_class_ptr)
+{
+}
+
 void dhcp_service_send_message(msg_tr_t *msg_tr_ptr)
 {
 }