DHCPv6 client and server update:

Added back to support for do dhcp solicit without IA non temporary address.

Server accept also slicit  wthout IA non temporary address.

Change-Id: Iaa6fef77f191889fdcb8b71d788eff37e438a208

Author: Juha Heiskanen

source/DHCPv6_client/dhcpv6_client_service.c

@@ -194,12 +194,12 @@ int dhcp_solicit_resp_cb(uint16_t instance_id, void *ptr, uint8_t msg_name,  uin
 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)
 {
     dhcpv6_solication_base_packet_s solPacket = {0};
-    dhcpv6_ia_non_temporal_address_s nonTemporalAddress = {0};
+
     uint8_t *payload_ptr;
     uint32_t payload_len;
     dhcpv6_client_server_data_t *srv_data_ptr;
 
-    if (mac64 == NULL || prefix == NULL || dhcp_addr == NULL) {
+    if (mac64 == NULL || dhcp_addr == NULL) {
         tr_error("Invalid parameters");
         return -1;
     }
@@ -210,7 +210,11 @@ int dhcp_client_get_global_address(int8_t interface, uint8_t dhcp_addr[static 16
         return -1;
     }
 
-    payload_len = libdhcpv6_solication_message_length(link_type, true, 0);
+    if (prefix) {
+        payload_len = libdhcpv6_solication_message_length(link_type, true, 0);
+    } else {
+        payload_len = libdhcpv6_solication_message_length(link_type, false, 0);
+    }
     payload_ptr = ns_dyn_mem_temporary_alloc(payload_len);
     if (!payload_ptr) {
         libdhcvp6_nontemporalAddress_server_data_free(srv_data_ptr);
@@ -227,8 +231,14 @@ int dhcp_client_get_global_address(int8_t interface, uint8_t dhcp_addr[static 16
     solPacket.messageType = DHCPV6_SOLICATION_TYPE;
     solPacket.transActionId = libdhcpv6_txid_get();
     /*Non Temporal Address */
-    nonTemporalAddress.requestedAddress = prefix;
-    libdhcpv6_generic_nontemporal_address_message_write(payload_ptr, &solPacket, &nonTemporalAddress, NULL);
+
+    if (prefix) {
+        dhcpv6_ia_non_temporal_address_s nonTemporalAddress = {0};
+        nonTemporalAddress.requestedAddress = prefix;
+        libdhcpv6_generic_nontemporal_address_message_write(payload_ptr, &solPacket, &nonTemporalAddress, NULL);
+    } else {
+        libdhcpv6_generic_nontemporal_address_message_write(payload_ptr, &solPacket, NULL, NULL);
+    }
 
     // send solicit
     srv_data_ptr->transActionId = dhcp_service_send_req(dhcp_client.service_instance, 0, srv_data_ptr, dhcp_addr, payload_ptr, payload_len, dhcp_solicit_resp_cb);

source/libDHCPv6/libDHCPv6.c

@@ -687,6 +687,11 @@ int libdhcpv6_get_IA_address(uint8_t *ptr, uint16_t data_length, dhcp_ia_non_tem
                     return 0;
                 }
             }
+        } else if (length == 0) {
+            params->nonTemporalAddress = NULL;
+            params->preferredValidLifeTime = 0;
+            params->validLifeTime = 0;
+            return 0;
         }
     }
     return -1;

source/libDHCPv6/libDHCPv6_server.c

@@ -132,7 +132,8 @@ dhcpv6_gua_server_entry_s *libdhcpv6_server_data_get_by_prefix_and_socketinstanc
 {
     ns_list_foreach(dhcpv6_gua_server_entry_s, cur, &dhcpv6_gua_server_list) {
         if (cur->socketInstance_id == socketInstance) {
-            if (memcmp(cur->guaPrefix, prefixPtr, 8) == 0) {
+
+            if (!prefixPtr || memcmp(cur->guaPrefix, prefixPtr, 8) == 0) {
                 return cur;
             }
         }