Merge branch 'release_internal' into release_external

* release_internal:
  Fixed network border router timeout recovery and EAPOL relay address fix
  Changed RADIUS MTU and small fixes
  Addeed support for DHCP vendor data
  DHCPv6 functionality update
  Added DHCPv6 vendor data generation for DNS queries
  FHSS: Changed retry backoffs when no BC schedule or TX slots (ARMmbed#2440)

Author: Arto Kinnunen

nanostack/ws_bbr_api.h

@@ -490,7 +490,8 @@ int ws_bbr_radius_timing_validate(int8_t interface_id, bbr_radius_timing_t *timi
  *
  * This function can be called multiple times.
  * if domain name matches a existing entry address is updated.
- * If address and domain name is set to NULL entire list is cleared
+ * If domain name is set to NULL entire list is cleared
+ * if address is set to NULL the Domain name is removed from the list.
  *
  * \param interface_id Network interface ID.
  * \param address The address of the DNS query result.

source/6LoWPAN/ws/ws_bbr_api.c

@@ -19,6 +19,7 @@
 #include "nsconfig.h"
 #include "ns_types.h"
 #include "ns_trace.h"
+#include "nsdynmemLIB.h"
 #include "net_interface.h"
 #include "socket_api.h"
 #include "eventOS_event.h"
@@ -41,6 +42,7 @@
 #include "6LoWPAN/ws/ws_pae_controller.h"
 #include "DHCPv6_Server/DHCPv6_server_service.h"
 #include "DHCPv6_client/dhcpv6_client_api.h"
+#include "libDHCPv6/libDHCPv6_vendordata.h"
 #include "libNET/src/net_dns_internal.h"
 
 
@@ -93,6 +95,17 @@ static rpl_dodag_conf_t rpl_conf = {
     .dio_redundancy_constant = WS_RPL_DIO_REDUNDANCY_SMALL
 };
 
+typedef struct dns_resolution {
+    /** Resolved address for the domain*/
+    uint8_t address[16];
+    /** Domain name string */
+    char *domain_name;
+} dns_resolution_t;
+
+#define MAX_DNS_RESOLUTIONS 4
+
+static dns_resolution_t pre_resolved_dns_queries[MAX_DNS_RESOLUTIONS] = {0};
+
 static void ws_bbr_rpl_version_timer_start(protocol_interface_info_entry_t *cur, uint8_t version)
 {
     // Set the next timeout value for version update
@@ -368,7 +381,8 @@ static bool wisun_dhcp_address_add_cb(int8_t interfaceId, dhcp_address_cache_upd
     wisun_bbr_na_send(backbone_interface_id, address_info->allocatedAddress);
     return true;
 }
-static void ws_bbr_dhcp_server_dns_info_update(protocol_interface_info_entry_t *cur)
+
+static void ws_bbr_dhcp_server_dns_info_update(protocol_interface_info_entry_t *cur, uint8_t *global_id)
 {
     //add DNS server information to DHCP server that is learned from the backbone interface.
     uint8_t dns_server_address[16];
@@ -377,13 +391,37 @@ static void ws_bbr_dhcp_server_dns_info_update(protocol_interface_info_entry_t *
     (void)cur;
     if (net_dns_server_get(backbone_interface_id, dns_server_address, &dns_search_list_ptr, &dns_search_list_len, 0) == 0) {
         /*Only supporting one DNS server address*/
-        //DHCPv6_server_service_set_dns_server(cur->id, dns_server_address, dns_search_list_ptr, dns_search_list_len);
+        DHCPv6_server_service_set_dns_server(cur->id, global_id, dns_server_address, dns_search_list_ptr, dns_search_list_len);
     }
 
     //TODO Generate vendor data in Wi-SUN network include the cached DNS query results in some sort of TLV format
-    (void)dhcp_vendor_data_ptr;
-    (void)dhcp_vendor_data_len;
-    //DHCPv6_server_service_set_vendor_data(cur->id, dhcp_vendor_data_ptr, dhcp_vendor_data_len);
+    int vendor_data_len = 0;
+    for (int n = 0; n < MAX_DNS_RESOLUTIONS; n++) {
+        if (pre_resolved_dns_queries[n].domain_name != NULL) {
+            vendor_data_len += net_dns_option_vendor_option_data_dns_query_length(pre_resolved_dns_queries[n].domain_name);
+        }
+    }
+    if (vendor_data_len) {
+        ns_dyn_mem_free(dhcp_vendor_data_ptr);
+        dhcp_vendor_data_ptr = ns_dyn_mem_alloc(vendor_data_len);
+        if (!dhcp_vendor_data_ptr) {
+            tr_warn("Vendor info set fail");
+            return;
+        }
+        dhcp_vendor_data_len = vendor_data_len;
+    }
+    if (dhcp_vendor_data_ptr) {
+        // Write vendor data
+        uint8_t *ptr = dhcp_vendor_data_ptr;
+        for (int n = 0; n < MAX_DNS_RESOLUTIONS; n++) {
+            if (pre_resolved_dns_queries[n].domain_name != NULL) {
+                ptr = net_dns_option_vendor_option_data_dns_query_write(ptr, pre_resolved_dns_queries[n].address, pre_resolved_dns_queries[n].domain_name);
+                tr_info("set DNS query result for %s, addr: %s", pre_resolved_dns_queries[n].domain_name, tr_ipv6(pre_resolved_dns_queries[n].address));
+            }
+        }
+    }
+
+    DHCPv6_server_service_set_vendor_data(cur->id, global_id, ARM_ENTERPRISE_NUMBER, dhcp_vendor_data_ptr, dhcp_vendor_data_len);
 }
 
 static void ws_bbr_dhcp_server_start(protocol_interface_info_entry_t *cur, uint8_t *global_id, uint32_t dhcp_address_lifetime)
@@ -406,7 +444,7 @@ static void ws_bbr_dhcp_server_start(protocol_interface_info_entry_t *cur, uint8
     //SEt max value for not limiting address allocation
     DHCPv6_server_service_set_max_clients_accepts_count(cur->id, global_id, MAX_SUPPORTED_ADDRESS_LIST_SIZE);
 
-    ws_bbr_dhcp_server_dns_info_update(cur);
+    ws_bbr_dhcp_server_dns_info_update(cur, global_id);
 
     ws_dhcp_client_address_request(cur, global_id, ll);
 }
@@ -594,7 +632,7 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
             // Add also global prefix and route to RPL
             rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, current_global_prefix, 64, 0, WS_ROUTE_LIFETIME, false);
         }
-        ws_bbr_dhcp_server_dns_info_update(cur);
+        ws_bbr_dhcp_server_dns_info_update(cur, current_global_prefix);
     }
 }
 void ws_bbr_pan_version_increase(protocol_interface_info_entry_t *cur)
@@ -1200,7 +1238,7 @@ int ws_bbr_dns_query_result_set(int8_t interface_id, const uint8_t address[16],
 {
 #ifdef HAVE_WS_BORDER_ROUTER
     protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(interface_id);
-    if (!cur || !address || !domain_name_ptr) {
+    if (!cur) {
         return -1;
     }
 
@@ -1210,10 +1248,62 @@ int ws_bbr_dns_query_result_set(int8_t interface_id, const uint8_t address[16],
      *
      * This is included in the vendor extension where the format is decided by the vendor
      */
-    // TODO search if entry exists replace if address is NULL delete the entry
-    // TODO This information should expire if not updated by client
 
-    ws_bbr_dhcp_server_dns_info_update(cur);
+    // Delete all entries
+    if (!domain_name_ptr) {
+        for (int n = 0; n < MAX_DNS_RESOLUTIONS; n++) {
+            // Delete all entries
+            memset(pre_resolved_dns_queries[n].address, 0, 16);
+            ns_dyn_mem_free(pre_resolved_dns_queries[n].domain_name);
+            pre_resolved_dns_queries[n].domain_name = NULL;
+        }
+        goto update_information;
+    }
+
+    // Update existing entries or delete
+    for (int n = 0; n < MAX_DNS_RESOLUTIONS; n++) {
+        if (pre_resolved_dns_queries[n].domain_name != NULL &&
+                strcasecmp(pre_resolved_dns_queries[n].domain_name, domain_name_ptr) == 0) {
+            // Matching query updated
+            if (address) {
+                // Update address
+                memcpy(pre_resolved_dns_queries[n].address, address, 16);
+            } else {
+                // delete entry
+                memset(pre_resolved_dns_queries[n].address, 0, 16);
+                ns_dyn_mem_free(pre_resolved_dns_queries[n].domain_name);
+                pre_resolved_dns_queries[n].domain_name = NULL;
+            }
+            goto update_information;
+        }
+    }
+
+    if (address && domain_name_ptr) {
+        // Store new entry to the list
+        for (int n = 0; n < MAX_DNS_RESOLUTIONS; n++) {
+            if (pre_resolved_dns_queries[n].domain_name == NULL) {
+                // Free entry found
+                pre_resolved_dns_queries[n].domain_name  = ns_dyn_mem_alloc(strlen(domain_name_ptr) + 1);
+                if (!pre_resolved_dns_queries[n].domain_name) {
+                    // Out of memory
+                    return -2;
+                }
+                memcpy(pre_resolved_dns_queries[n].address, address, 16);
+                strcpy(pre_resolved_dns_queries[n].domain_name, domain_name_ptr);
+                goto update_information;
+            }
+        }
+        // No room to store new field
+        return -3;
+    }
+
+update_information:
+    if (memcmp(current_global_prefix, ADDR_UNSPECIFIED, 8) == 0) {
+        // Not in active state so changes are activated after start
+        return 0;
+    }
+
+    ws_bbr_dhcp_server_dns_info_update(cur, current_global_prefix);
     return 0;
 #else
     (void) interface_id;

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"
@@ -73,6 +74,7 @@
 #include "6LoWPAN/ws/ws_eapol_pdu.h"
 #include "6LoWPAN/ws/ws_eapol_auth_relay.h"
 #include "6LoWPAN/ws/ws_eapol_relay.h"
+#include "libNET/src/net_dns_internal.h"
 
 #define TRACE_GROUP "wsbs"
 
@@ -872,6 +874,80 @@ static void ws_bootstrap_dhcp_neighbour_update_cb(int8_t interface_id, uint8_t l
     ws_bootstrap_mac_neighbor_short_time_set(cur, mac64, WS_NEIGHBOUR_DHCP_ENTRY_LIFETIME);
 }
 
+static void ws_bootstrap_dhcp_info_notify_cb(int8_t interface, dhcp_option_notify_t *options, dhcp_server_notify_info_t *server_info)
+{
+    protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(interface);
+    if (!cur) {
+        return;
+    }
+    uint8_t server_ll64[16];
+    memcpy(server_ll64, ADDR_LINK_LOCAL_PREFIX, 8);
+
+    if (server_info->duid_length == 8) {
+        memcpy(server_ll64 + 8, server_info->duid, 8);
+    } else {
+        server_ll64[8] = server_info->duid[0];
+        server_ll64[9] = server_info->duid[1];
+        server_ll64[10] = server_info->duid[2];
+        server_ll64[11] = 0xff;
+        server_ll64[12] = 0xfe;
+        server_ll64[13] = server_info->duid[3];
+        server_ll64[14] = server_info->duid[4];
+        server_ll64[15] = server_info->duid[5];
+    }
+    server_ll64[8] ^= 2;
+
+    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:
+            while (options->option.generic.data_length) {
+                net_dns_server_address_set(interface, server_ll64, options->option.generic.data, server_info->life_time);
+                options->option.generic.data_length -= 16;
+                options->option.generic.data += 16;
+            }
+            break;
+        case DHCPV6_OPTION_DOMAIN_LIST:
+            net_dns_server_search_list_set(interface, server_ll64, options->option.generic.data, options->option.generic.data_length, server_info->life_time);
+            break;
+        default:
+            break;
+    }
+
+}
+
+
 static int8_t ws_bootstrap_up(protocol_interface_info_entry_t *cur)
 {
     int8_t ret_val = -1;
@@ -923,6 +999,7 @@ static int8_t ws_bootstrap_up(protocol_interface_info_entry_t *cur)
     dhcp_service_link_local_rx_cb_set(cur->id, ws_bootstrap_dhcp_neighbour_update_cb);
     dhcp_client_configure(cur->id, true, true, true); //RENEW uses SOLICIT, Interface will use 1 instance for address get, IAID address hint is not used.
     dhcp_client_solicit_timeout_set(cur->id, WS_DHCP_SOLICIT_TIMEOUT, WS_DHCP_SOLICIT_MAX_RT, WS_DHCP_SOLICIT_MAX_RC);
+    dhcp_client_option_notification_cb_set(cur->id, ws_bootstrap_dhcp_info_notify_cb);
 
 
     ws_nud_table_reset(cur);
@@ -1520,7 +1597,11 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
     tr_info("Updated PAN configuration own:%d, heard:%d", cur->ws_info->pan_information.pan_version, pan_version);
 
     // restart PAN version timer
-    cur->ws_info->pan_timeout_timer = cur->ws_info->cfg->timing.pan_timeout;
+    //Check Here Do we have a selected Primary parent
+    if (!cur->ws_info->configuration_learned || cur->ws_info->rpl_state == RPL_EVENT_DAO_DONE) {
+        cur->ws_info->pan_timeout_timer = cur->ws_info->cfg->timing.pan_timeout;
+    }
+
     cur->ws_info->pan_information.pan_version = pan_version;
 
     ws_pae_controller_gtk_hash_update(cur, gtkhash_ptr);

source/6LoWPAN/ws/ws_config.h

@@ -273,4 +273,11 @@ extern uint8_t DEVICE_MIN_SENS;
 #define RADIUS_CLIENT_RETRY_IMAX           30       // First retry maximum 3 seconds
 #define RADIUS_CLIENT_TIMER_EXPIRATIONS    3        // Number of retries is three
 
+/*
+ *  EAP-TLS fragment length
+ *
+ *  Configures both EAP-TLS and the RADIUS client (Framed-MTU on RFC 2864)
+ */
+#define EAP_TLS_FRAGMENT_LEN_VALUE         600       // EAP-TLS fragment length
+
 #endif /* WS_CONFIG_H_ */

source/6LoWPAN/ws/ws_eapol_relay.c

@@ -66,11 +66,14 @@ int8_t ws_eapol_relay_start(protocol_interface_info_entry_t *interface_ptr, uint
         return -1;
     }
 
-    if (ws_eapol_relay_get(interface_ptr)) {
+    eapol_relay_t *eapol_relay = ws_eapol_relay_get(interface_ptr);
+
+    if (eapol_relay) {
+        memcpy(&eapol_relay->remote_addr.address, remote_addr, 16);
         return 0;
     }
 
-    eapol_relay_t *eapol_relay = ns_dyn_mem_alloc(sizeof(eapol_relay_t));
+    eapol_relay = ns_dyn_mem_alloc(sizeof(eapol_relay_t));
     if (!eapol_relay) {
         return -1;
     }

source/6LoWPAN/ws/ws_pae_controller.c

@@ -1221,7 +1221,8 @@ int8_t ws_pae_controller_radius_address_set(int8_t interface_id, const uint8_t *
     }
 
     if (ws_pae_auth_radius_address_set(controller->interface_ptr, radius_cfg->radius_addr) < 0) {
-        return -1;
+        // If not set here since authenticator not created, then set on authenticator initialization
+        return 0;
     }
 
     return 0;

source/Common_Protocols/icmpv6.c

@@ -639,6 +639,21 @@ if_address_entry_t *icmpv6_slaac_address_add(protocol_interface_info_entry_t *cu
 }
 
 #ifdef HAVE_IPV6_ND
+
+static uint8_t icmpv6_dns_search_list_remove_pad(uint8_t *data_ptr, uint8_t length)
+{
+    while (length) {
+
+        if (data_ptr[length - 2] && data_ptr[length - 1] == 0) {
+            break;
+        } else if (data_ptr[length - 2] == 0 && data_ptr[length - 1] == 0) {
+            length--;
+        }
+    }
+
+    return length;
+}
+
 static buffer_t *icmpv6_ra_handler(buffer_t *buf)
 {
     protocol_interface_info_entry_t *cur;
@@ -869,7 +884,8 @@ static buffer_t *icmpv6_ra_handler(buffer_t *buf)
             uint32_t dns_lifetime = common_read_32_bit(dptr + 2); // 2 x reserved
             uint8_t *dns_search_list = dptr + 6;
             uint8_t dns_search_list_len = length - 8; // Length includes type and length
-
+            //Cut Padding
+            dns_search_list_len = icmpv6_dns_search_list_remove_pad(dns_search_list, dns_search_list_len);
             //tr_info("DNS Search List: %s Lifetime: %lu", trace_array(dns_search_list, dns_search_list_len), (unsigned long) dns_lifetime);
             // Add DNS server to DNS information storage.
             net_dns_server_search_list_set(cur->id, buf->src_sa.address, dns_search_list, dns_search_list_len, dns_lifetime);