Fixed DHCPv6 prefix update case

Border router remove client same time than server -> fix address missing at Wi-sun border router.

RPL prefix update will deprecate old address at case when RPL start advertisment a new Prefix.
Fix case when same time old prefix deleted and new activated.

Change-Id: Icc22f7f7631ac315617a64707524cfda6fb4ee70

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bbr_api.c

@@ -37,6 +37,7 @@
 #include "6LoWPAN/ws/ws_bbr_api_internal.h"
 #include "6LoWPAN/ws/ws_pae_controller.h"
 #include "DHCPv6_Server/DHCPv6_server_service.h"
+#include "DHCPv6_client/dhcpv6_client_api.h"
 
 #include "ws_bbr_api.h"
 
@@ -285,8 +286,13 @@ static void ws_bbr_dhcp_server_start(protocol_interface_info_entry_t *cur, uint8
 }
 static void ws_bbr_dhcp_server_stop(protocol_interface_info_entry_t *cur, uint8_t *global_id)
 {
-    tr_debug("DHCP server deactivate %s", trace_ipv6(global_id));
+    uint8_t temp_address[16];
+    memcpy(temp_address, global_id, 8);
+    memset(temp_address + 8, 0, 8);
+    tr_debug("DHCP server deactivate %s", trace_ipv6(temp_address));
     DHCPv6_server_service_delete(cur->id, global_id, false);
+    //Delete Client
+    dhcp_client_global_address_delete(cur->id, NULL, temp_address);
 
 }
 

source/DHCPv6_client/dhcpv6_client_service.c

@@ -235,18 +235,28 @@ int dhcp_client_get_global_address(int8_t interface, uint8_t dhcp_addr[static 16
             //Already Created to same interface
             if (dhcp_client.one_instance_interface && prefix) {
                 if (srv_data_ptr->iaNonTemporalStructValid) {
-                    if (memcmp(srv_data_ptr->iaNontemporalAddress.addressPrefix, prefix, 8)) {
-                        //Request new address direct from Server if prefix is new
-                        srv_data_ptr->iaNonTemporalStructValid = false;
-                        dhcpv6_renew(protocol_stack_interface_info_get_by_id(interface), NULL, ADDR_CALLBACK_TIMER);
+                    if (memcmp(srv_data_ptr->iaNontemporalAddress.addressPrefix, prefix, 8) == 0) {
+                        return 0;
                     }
-                    return 0;
+
+                    protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(interface);
+                    if (!cur) {
+                        return -1;
+                    }
+
+                    dhcp_service_req_remove_all(srv_data_ptr);// remove all pending retransmissions
+                    addr_deprecate(cur, srv_data_ptr->iaNontemporalAddress.addressPrefix);
+                    srv_data_ptr->iaNonTemporalStructValid = false;
+                    memcpy(srv_data_ptr->iaNontemporalAddress.addressPrefix, prefix, 8);
+                    goto dhcp_address_get;
+
                 } else if (dhcp_client_server_address_update(interface, prefix, dhcp_addr) == 0) {
                     //DHCP server address OK
                     return 0;
                 }
             }
             return -1;
+
         }
     } else if (dhcp_client_server_address_update(interface, prefix, dhcp_addr) == 0) {
         //No need for allocate new
@@ -260,7 +270,7 @@ int dhcp_client_get_global_address(int8_t interface, uint8_t dhcp_addr[static 16
         tr_error("OOM srv_data_ptr");
         return -1;
     }
-
+dhcp_address_get:
 
     if (!prefix || dhcp_client.no_address_hint) {
         add_prefix = false;