Addeed support for DHCP vendor data

Mika · Mika Tervonen · commit a9f8b756e1d9 · 2020-09-03T12:34:10.000+03:00
Process ARM vendor data at Wi-SUN bootstrap

Fixed DHCP client vendor data processing

Added new ARM Vendor data to transfer DNS cache results
Removed Extra traces
diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -65,6 +65,7 @@
 #include "platform/topo_trace.h"
 #include "dhcp_service_api.h"
 #include "libDHCPv6/libDHCPv6.h"
+#include "libDHCPv6/libDHCPv6_vendordata.h"
 #include "DHCPv6_client/dhcpv6_client_api.h"
 #include "ws_management_api.h"
 #include "net_rpl.h"
@@ -898,7 +899,36 @@ static void ws_bootstrap_dhcp_info_notify_cb(int8_t interface, dhcp_option_notif
 
     switch (options->option_type) {
         case DHCPV6_OPTION_VENDOR_SPECIFIC_INFO:
+            if (options->option.vendor_spesific.enterprise_number != ARM_ENTERPRISE_NUMBER) {
+                break;
+            }
+            while (options->option.vendor_spesific.data_length) {
+                uint16_t option_type;
+                char *domain;
+                uint8_t *address;
+                uint16_t option_len;
+                option_len = net_dns_option_vendor_option_data_get_next(options->option.vendor_spesific.data, options->option.vendor_spesific.data_length, &option_type);
+                tr_debug("DHCP vendor specific data type:%u length %d", option_type, option_len);
+                //tr_debug("DHCP vendor specific data %s", trace_array(options->option.vendor_spesific.data, options->option.vendor_spesific.data_length));
+
+                if (option_len == 0) {
+                    // Option fields were corrupted
+                    break;
+                }
+                if (option_type == ARM_DHCP_VENDOR_DATA_DNS_QUERY_RESULT) {
+                    // Process ARM DNS query result
+                    domain = NULL;
+                    address = NULL;
+                    if (net_dns_option_vendor_option_data_dns_query_read(options->option.vendor_spesific.data, options->option.vendor_spesific.data_length, &address, &domain) > 0 ||
+                            domain || address) {
+                        // Valid ARM DNS query entry
+                        net_dns_query_result_set(interface, address, domain, server_info->life_time);
+                    }
+                }
 
+                options->option.vendor_spesific.data_length -= option_len;
+                options->option.vendor_spesific.data += option_len;
+            }
             break;
 
         case DHCPV6_OPTION_DNS_SERVERS:
diff --git a/source/DHCPv6_client/dhcpv6_client_service.c b/source/DHCPv6_client/dhcpv6_client_service.c
@@ -244,9 +244,9 @@ static void dhcp_vendor_information_notify(uint8_t *ptr, uint16_t data_len, dhcp
 
     dhcp_server_notify_info_t server_info;
     server_info.life_time = srv_data_ptr->iaNontemporalAddress.validLifetime;
-    server_info.duid = srv_data_ptr->serverDUID.duid;
+    server_info.duid = srv_data_ptr->serverDUID.duid + 2; // Skip the type
     server_info.duid_type = srv_data_ptr->serverDUID.type;
-    server_info.duid_length = srv_data_ptr->serverDUID.duid_length;
+    server_info.duid_length = srv_data_ptr->serverDUID.duid_length - 2;// remove the type
 
     while (data_len >= 4) {
         type = common_read_16_bit(ptr);
@@ -265,18 +265,19 @@ static void dhcp_vendor_information_notify(uint8_t *ptr, uint16_t data_len, dhcp
             dhcp_option.option.vendor_spesific.enterprise_number = common_read_32_bit(ptr);
             ptr += 4;
             data_len -= 4;
+            length -= 4;
             dhcp_option.option.vendor_spesific.data = ptr;
-            dhcp_option.option.vendor_spesific.data_length = data_len;
+            dhcp_option.option.vendor_spesific.data_length = length;
 
 
-        } else if (type == DHCPV6_OPTION_DNS_SERVERS && (data_len >= 16 && ((data_len % 16) == 0))) {
+        } else if (type == DHCPV6_OPTION_DNS_SERVERS && (length >= 16 && ((length % 16) == 0))) {
             valid_optional_options = true;
             dhcp_option.option.generic.data = ptr;
-            dhcp_option.option.generic.data_length = data_len;
+            dhcp_option.option.generic.data_length = length;
         } else if (type == DHCPV6_OPTION_DOMAIN_LIST) {
             valid_optional_options = true;
             dhcp_option.option.generic.data = ptr;
-            dhcp_option.option.generic.data_length = data_len;
+            dhcp_option.option.generic.data_length = length;
         }
         if (valid_optional_options) {
             dhcp_option.option_type = type;
diff --git a/source/libDHCPv6/libDHCPv6_vendordata.c b/source/libDHCPv6/libDHCPv6_vendordata.c
@@ -23,6 +23,7 @@
 #include "libDHCPv6.h"
 #include "libDHCPv6_vendordata.h"
 
+#define TRACE_GROUP "vend"
 
 
 /* DHCPv6 vendor options to distribute ARM vendor data*/
@@ -45,3 +46,55 @@ uint8_t *net_dns_option_vendor_option_data_dns_query_write(uint8_t *ptr, uint8_t
     ptr += domain_len + 1;
     return ptr;
 }
+
+uint16_t net_dns_option_vendor_option_data_get_next(uint8_t *ptr, uint16_t length, uint16_t *type)
+{
+    uint16_t option_len;
+
+    if (length < 4) {
+        // Corrupted
+        return 0;
+    }
+    if (type) {
+        *type = common_read_16_bit(ptr);
+    }
+
+    option_len = common_read_16_bit(ptr + 2);
+    if (option_len + 4 > length) {
+        // Corrupted
+        return 0;
+    }
+
+    return option_len + 4;
+}
+
+uint16_t net_dns_option_vendor_option_data_dns_query_read(uint8_t *ptr, uint16_t length, uint8_t **address, char **domain)
+{
+    uint16_t option_len;
+    option_len = common_read_16_bit(ptr + 2);
+
+    if (length < 4 + 16 + 1) {
+        // Corrupted as there is no room for all fields
+        return 0;
+    }
+    if (option_len < 17) {
+        // Corrupted as not enough room in field
+        return 0;
+    }
+    if (*(ptr + 4 + option_len - 1) != 0) {
+        // Not nul terminated string for domain
+        return 0;
+    }
+
+    if (common_read_16_bit(ptr) != ARM_DHCP_VENDOR_DATA_DNS_QUERY_RESULT) {
+        return 0;
+    }
+
+    if (address) {
+        *address = ptr + 4;
+    }
+    if (domain) {
+        *domain = (char *)(ptr + 4 + 16);
+    }
+    return option_len;
+}
diff --git a/source/libDHCPv6/libDHCPv6_vendordata.h b/source/libDHCPv6/libDHCPv6_vendordata.h
@@ -37,6 +37,8 @@
 uint16_t net_dns_option_vendor_option_data_dns_query_length(char *domain);
 uint8_t *net_dns_option_vendor_option_data_dns_query_write(uint8_t *ptr, uint8_t *address, char *domain);
 
+uint16_t net_dns_option_vendor_option_data_get_next(uint8_t *ptr, uint16_t length, uint16_t *type);
+uint16_t net_dns_option_vendor_option_data_dns_query_read(uint8_t *ptr, uint16_t length, uint8_t **address, char **domain);
 
 
 #endif /* LIBDHCPV6_VENDOR_DATA_H_ */
diff --git a/source/libNET/src/net_dns.c b/source/libNET/src/net_dns.c
@@ -115,7 +115,7 @@ int8_t net_dns_server_address_set(int8_t interface_id, const uint8_t address[16]
     }
     info_ptr->lifetime = lifetime;
     memcpy(info_ptr->dns_server_address, dns_server_address, 16);
-    tr_info("DNS Server: %s Lifetime: %lu", trace_ipv6(info_ptr->dns_server_address), (unsigned long) info_ptr->lifetime);
+    tr_info("DNS Server: %s from: %s Lifetime: %lu", trace_ipv6(info_ptr->dns_server_address), trace_ipv6(info_ptr->address), (unsigned long) info_ptr->lifetime);
     return 0;
 }
 
@@ -234,7 +234,7 @@ static dns_query_t *dns_query_result_create(int8_t interface_id, const char *dom
     }
     this->interface_id = interface_id;
     strcpy(this->domain_str, domain_str);
-    tr_debug("Create DNS query entry for %s", this->domain_str);
+    //tr_debug("Create DNS query entry for %s", this->domain_str);
     ns_list_add_to_start(&dns_query_list, this);
     return this;
 }

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ int8_t net_dns_server_address_set(int8_t interface_id, const uint8_t address[16]`
`115`	`115`	`}`
`116`	`116`	`info_ptr->lifetime = lifetime;`
`117`	`117`	`memcpy(info_ptr->dns_server_address, dns_server_address, 16);`
`118`		`- tr_info("DNS Server: %s Lifetime: %lu", trace_ipv6(info_ptr->dns_server_address), (unsigned long) info_ptr->lifetime);`
	`118`	`+ tr_info("DNS Server: %s from: %s Lifetime: %lu", trace_ipv6(info_ptr->dns_server_address), trace_ipv6(info_ptr->address), (unsigned long) info_ptr->lifetime);`
`119`	`119`	`return 0;`
`120`	`120`	`}`
`121`	`121`
`@@ -234,7 +234,7 @@ static dns_query_t dns_query_result_create(int8_t interface_id, const char dom`
`234`	`234`	`}`
`235`	`235`	`this->interface_id = interface_id;`
`236`	`236`	`strcpy(this->domain_str, domain_str);`
`237`		`- tr_debug("Create DNS query entry for %s", this->domain_str);`
	`237`	`+ //tr_debug("Create DNS query entry for %s", this->domain_str);`
`238`	`238`	`ns_list_add_to_start(&dns_query_list, this);`
`239`	`239`	`return this;`
`240`	`240`	`}`