Merge branch 'master' into IOTTHD-3027

* master: (50 commits)
  Added empty function for test
  Added support for ARO registration failure
  Added empty function fr new interface
  Added api to configure network size parameters
  Flagged mbed TLS KW header and corrected bool definitions
  Corrected NIST AES KW flagging
  Removed temporary KW functions and corrected ut and style
  Added GKH MIC validation and encryption
  Moved 4WH functions to library and added constants
  Added unit test to NIST AES KW library
  added parent priority handling. (#1942)
  Fix coverity error (#1943)
  thread_mle_message_handler: fix build warning (#1940)
  Follow Mbed OS coding style (#1941)
  Sync mbed_lib.json with Mbed OS (#1935)
  Added Wi-Sun flagging to eapol helper
  Disabled EAPOL flags
  Tuned EAPOL timers for small networks
  added Wi-SUN neighbor table management to Wi-SUN
  Corrected KMP api start on authenticator
  ...

Author: Jarkko Paso

mbed_lib.json

@@ -1,7 +1,24 @@
 {
     "name": "nanostack",
     "config": {
-        "configuration": "nanostack_full"
+        "configuration": {
+            "help": "Build time configuration. Refer to Handbook for valid values. Default: full stack",
+            "value": "nanostack_full"
+        }
     },
-    "macros": ["NS_USE_EXTERNAL_MBED_TLS"]
+    "macros": ["NS_USE_EXTERNAL_MBED_TLS"],
+    "target_overrides": {
+        "KW24D": {
+            "nanostack.configuration": "lowpan_router"
+        },
+        "NCS36510": {
+            "nanostack.configuration": "lowpan_router"
+        },
+        "TB_SENSE_12": {
+            "nanostack.configuration": "lowpan_router"
+        },
+        "KW41Z": {
+            "nanostack.configuration": "lowpan_router"
+        }
+    }
 }

nanostack/net_thread_test.h

@@ -530,6 +530,30 @@ int thread_test_mle_message_send(int8_t interface_id, uint8_t *dst_address, uint
  * \return <0                        Failure
  */
 int thread_test_extension_name_set(int8_t interface_id, char extension_name[16]);
+
+/**
+ * \brief Set multicast addresses per message.
+ *
+ * \param value                      Number of addresses per message (valid range 1-15)
+ *
+ * \return 0                         OK
+ * \return <0                        Failure
+ */
+int8_t thread_test_mcast_address_per_message_set(uint8_t value);
+
+/**
+ * Thread router parent priority set.
+ *
+ * This function is used to set parent priority in connectivity TLV.
+ *
+ * \param interface_id Network interface ID.
+ * \param parent_priority value to be set (0x40 High, 0x00 Medium, 0xC0 Low, 0x80 Do not use) .
+ *
+ * \return 0, Set OK.
+ * \return <0 Set Fail.
+ */
+int thread_test_parent_priority_set(int8_t interface_id, uint8_t parent_priority);
+
 #ifdef __cplusplus
 }
 #endif

nanostack/net_ws_test.h

@@ -40,7 +40,7 @@ extern "C" {
 #include "ns_types.h"
 
 /**
- * \brief Set extension name.
+ * \brief Set Pan size.
  *
  * Pan size is reported to advertisement. Using this function
  * actual value can be overridden.
@@ -54,6 +54,24 @@ extern "C" {
  * \return <0                        Failure
  */
 int ws_test_pan_size_set(int8_t interface_id, uint16_t pan_size);
+
+/**
+ * \brief Set maximum child count.
+ *
+ * Maximum amount of children allowed for this device
+ *
+ * Values above MAC neighbor table - RPL parents - temporary entries will cause undefined behaviour
+ *
+ * Set child count to 0xffff to stop override
+ *
+ * \param interface_id               Network Interface
+ * \param child_count                   Pan size reported in advertisements
+ *
+ * \return 0                         OK
+ * \return <0                        Failure
+ */
+int ws_test_max_child_count_set(int8_t interface_id, uint16_t child_count);
+
 #ifdef __cplusplus
 }
 #endif

nanostack/ws_management_api.h

@@ -75,6 +75,10 @@ extern "C" {
 #define CHANNEL_SPACING_100 0x03 // 100 khz
 #define CHANNEL_SPACING_250 0x04 // 250 khz
 
+#define NETWORK_SIZE_AUTOMATIC 0x00
+#define NETWORK_SIZE_SMALL 0x01
+#define NETWORK_SIZE_LARGE 0x10
+
 
 /** Temporary API change flag. this will be removed when new version of API is implemented on applications
  *
@@ -126,6 +130,27 @@ int ws_management_regulatory_domain_set(
     uint8_t operating_class,
     uint8_t operating_mode);
 
+/**
+ * Set timing parameters related to network size.
+ *
+ * timing parameters follows the specification example from Wi-SUN specification
+ *
+ * Default value: automatic
+ * small network size: hundreds of devices
+ * Large network size: thousands of devices
+ * automatic: when discovering the network network size is learned
+ *            from advertisements and timings adjusted accordingly
+ *
+ * \param interface_id Network interface ID.
+ * \param network_size define from NETWORK_SIZE_*.
+ *
+ * \return 0, Init OK.
+ * \return <0 Init fail.
+ */
+int ws_management_network_size_set(
+    int8_t interface_id,
+    uint8_t network_size);
+
 /**
  * Set channel mask for FHSS operation.
  *

source/6LoWPAN/ND/nd_router_object.c

@@ -923,6 +923,12 @@ bool nd_ns_aro_handler(protocol_interface_info_entry_t *cur_interface, const uin
     }
 
     /* TODO - check hard upper limit on registrations? */
+    if (ws_info(cur_interface) &&
+            !ws_common_allow_child_registration(cur_interface)) {
+        aro_out->present = true;
+        aro_out->status = ARO_FULL;
+        return true;
+    }
 
     /* We need to have entry in the Neighbour Cache */
     ipv6_neighbour_t *neigh = ipv6_neighbour_lookup_or_create(&cur_interface->ipv6_neighbour_cache, src_addr);

source/6LoWPAN/Thread/thread_common.c

@@ -484,6 +484,7 @@ int thread_info_allocate_and_init(protocol_interface_info_entry_t *cur)
         cur->thread_info->version = thread_version; // Default implementation version
         cur->thread_info->thread_device_mode = THREAD_DEVICE_MODE_END_DEVICE;
         cur->thread_info->childUpdateReqTimer = -1;
+        cur->thread_info->parent_priority = CONNECTIVITY_PP_INVALID; // default invalid - calculated using child count
 
         thread_routing_init(&cur->thread_info->routing);
         thread_network_local_server_data_base_init(&cur->thread_info->localServerDataBase);
@@ -1245,7 +1246,9 @@ uint8_t *thread_connectivity_tlv_write(uint8_t *ptr, protocol_interface_info_ent
     *ptr++ = 10;
 
     // determine parent priority
-    if ((mode & MLE_DEV_MASK) == MLE_RFD_DEV && (3 * mle_class_rfd_entry_count_get(cur) > 2 * THREAD_MAX_MTD_CHILDREN)) {
+    if ((thread->parent_priority & CONNECTIVITY_PP_MASK) != CONNECTIVITY_PP_INVALID) {
+        *ptr++ = thread->parent_priority & CONNECTIVITY_PP_MASK;
+    } else if ((mode & MLE_DEV_MASK) == MLE_RFD_DEV && (3 * mle_class_rfd_entry_count_get(cur) > 2 * THREAD_MAX_MTD_CHILDREN)) {
         *ptr++ = CONNECTIVITY_PP_LOW;
     } else if (!(mode & MLE_RX_ON_IDLE) && (3 * mle_class_sleepy_entry_count_get(cur) > 2 * THREAD_MAX_SED_CHILDREN)) {
         *ptr++ = CONNECTIVITY_PP_LOW;

source/6LoWPAN/Thread/thread_common.h

@@ -68,6 +68,7 @@ struct mac_neighbor_table_entry;
 #define THREAD_KEY_INDEX(seq) ((uint8_t) (((seq) & 0x0000007f) + 1))
 
 extern uint8_t thread_version;
+extern uint8_t thread_max_mcast_addr;
 extern uint32_t thread_delay_timer_default;
 extern uint32_t thread_router_selection_jitter;
 extern uint16_t thread_joiner_port;
@@ -316,6 +317,7 @@ typedef struct thread_info_s {
     //uint8_t lastValidRouteMask[8];
     int8_t interface_id; //Thread Interface ID
     uint8_t version;
+    uint8_t parent_priority;
     uint8_t testMaxActiveRouterIdLimit; //Default for this is 32
     uint8_t maxChildCount; //Default for this is 24
     uint8_t partition_weighting;

source/6LoWPAN/Thread/thread_constants.h

@@ -186,4 +186,6 @@
 /** Thread prefix minimum lifetime in seconds */
 #define THREAD_MIN_PREFIX_LIFETIME  3600
 
+#define THREAD_MCAST_ADDR_PER_MSG 4 // One multicast registration message fits 4 addresses by default
+
 #endif /* THREAD_CONSTANTS_H_ */

source/6LoWPAN/Thread/thread_extension.c

@@ -210,9 +210,7 @@ static void thread_extension_reset_timeout_cb(void *arg)
     // Delete all domain stuff and start discovery.
     thread_extension_bootstrap_network_certificate_set(cur, NULL, 0);
     thread_extension_bootstrap_network_private_key_set(cur, NULL, 0);
-    thread_nvm_store_active_configuration_remove();
     thread_nvm_store_mleid_rloc_map_remove();
-    thread_nvm_store_pending_configuration_remove();
     thread_nvm_store_link_info_clear();
     thread_joiner_application_link_configuration_delete(cur->id);
     thread_bootstrap_connection_error(cur->id, CON_ERROR_NETWORK_KICK, NULL);
@@ -295,8 +293,6 @@ static int thread_extension_reenroll_req_cb(int8_t service_id, uint8_t source_ad
         goto send_response;
     }
 
-
-
     thread_extension_bootstrap_reenrollment_start(cur, service_id, pbbr_addr);
 
 send_response:
@@ -674,8 +670,6 @@ bool thread_extension_aloc_map(protocol_interface_info_entry_t *cur, uint16_t *a
     }
     return false;
 }
-// Amount of Addressess in MLR message 4 fits in one fragment
-#define ADDR_PER_MSG 4
 
 void thread_extension_mcast_subscrition_change(protocol_interface_info_entry_t *interface)
 {
@@ -688,7 +682,7 @@ void thread_extension_mcast_subscrition_change(protocol_interface_info_entry_t *
     if (0 != thread_extension_primary_bbr_get(interface, br_ml_addr, NULL, &mlr_timer, NULL)) {
         return;
     }
-    addr = ns_dyn_mem_temporary_alloc(16 * ADDR_PER_MSG + 2);
+    addr = ns_dyn_mem_temporary_alloc(16 * thread_max_mcast_addr + 2);
     if (!addr) {
         return;
     }
@@ -708,7 +702,7 @@ void thread_extension_mcast_subscrition_change(protocol_interface_info_entry_t *
         ptr += 16;
         addr_len = ptr - addr;
         addr[1] = addr_len - 2;// Fill in the length
-        if (addr_len > 16 * ADDR_PER_MSG) {
+        if (addr_len > 16 * thread_max_mcast_addr) {
             // Send first patch
             thread_extension_mlr_req_send(interface, br_ml_addr, addr, addr_len);
             // Reset the packet to start

source/6LoWPAN/Thread/thread_extension_bbr.c

@@ -69,6 +69,7 @@
 typedef struct {
     uint8_t pbbr_multicast_address[16];
     uint8_t tri_address[16];
+    uint8_t registrar_address[16];
     uint8_t domain_prefix[8];
     uint32_t mlr_timeout;
     uint32_t delay_timer;
@@ -317,6 +318,7 @@ static int thread_pbbr_data_req_recv_cb(int8_t service_id, uint8_t source_addres
     (void) source_port;
 
     uint8_t payload_ptr[18] = {0};
+    uint8_t *address_ptr;
     uint8_t *request_tlv_ptr;
     uint16_t request_tlv_len;
     uint8_t *ptr = payload_ptr;
@@ -326,6 +328,8 @@ static int thread_pbbr_data_req_recv_cb(int8_t service_id, uint8_t source_addres
         return -1;
     }
 
+    tr_debug("MGMT_BBR_GET.req received");
+
     request_tlv_len = thread_tmfcop_tlv_find(request_ptr->payload_ptr, request_ptr->payload_len, MESHCOP_TLV_GET, &request_tlv_ptr);
 
     if (0 == request_tlv_len) {
@@ -335,7 +339,14 @@ static int thread_pbbr_data_req_recv_cb(int8_t service_id, uint8_t source_addres
 
     if (thread_meshcop_tlv_list_type_available(request_tlv_ptr, request_tlv_len, MESHCOP_TLV_REGISTRAR_IPV6_ADDRESS)) {
         tr_debug("Registrar IPv6 address requested");
-        ptr = thread_meshcop_tlv_data_write(ptr, MESHCOP_TLV_REGISTRAR_IPV6_ADDRESS, 16, this->tri_address);
+        // If registrar address is not set, return TRI address
+        if (addr_is_ipv6_unspecified(this->registrar_address)) {
+            address_ptr = this->tri_address;
+        } else {
+            address_ptr = this->registrar_address;
+        }
+
+        ptr = thread_meshcop_tlv_data_write(ptr, MESHCOP_TLV_REGISTRAR_IPV6_ADDRESS, 16, address_ptr);
     }
 
     coap_service_response_send(this->coap_service_id, COAP_REQUEST_OPTIONS_NONE, request_ptr, COAP_MSG_CODE_RESPONSE_CHANGED, COAP_CT_OCTET_STREAM, payload_ptr, ptr - payload_ptr);
@@ -348,6 +359,35 @@ static int thread_pbbr_data_set_recv_cb(int8_t service_id, uint8_t source_addres
     (void) source_address;
     (void) source_port;
 
+    uint8_t response[3] = {0};
+    uint8_t *ptr = response;
+    int8_t response_code = -1;
+    uint8_t *registrar_addr = NULL;
+    thread_pbbr_t *this = thread_border_router_find_by_service(service_id);
+
+    if (!request_ptr || !this) {
+        return -1;
+    }
+
+    tr_debug("MGMT_BBR_SET.req received");
+
+    if (16 == thread_meshcop_tlv_find(request_ptr->payload_ptr, request_ptr->payload_len, MESHCOP_TLV_REGISTRAR_IPV6_ADDRESS, &registrar_addr)) {
+        memcpy(this->registrar_address, registrar_addr, 16);
+        response_code = 1;
+    }
+
+    ptr = thread_meshcop_tlv_data_write_uint8(response, MESHCOP_TLV_STATE, response_code);
+
+    coap_service_response_send(service_id, COAP_REQUEST_OPTIONS_NONE, request_ptr, COAP_MSG_CODE_RESPONSE_CHANGED, COAP_CT_OCTET_STREAM, response, ptr - response);
+
+    return 0;
+}
+
+static int thread_pbbr_sec_data_set_recv_cb(int8_t service_id, uint8_t source_address[static 16], uint16_t source_port, sn_coap_hdr_s *request_ptr)
+{
+    (void) source_address;
+    (void) source_port;
+
     uint8_t response[3] = {0};
     uint8_t *ptr = response;
 
@@ -1144,7 +1184,9 @@ static int thread_extension_bbr_pbbr_start(thread_pbbr_t *this)
     coap_service_register_uri(this->coap_service_id, THREAD_URI_BBR_NMK_RX_NTF, COAP_SERVICE_ACCESS_POST_ALLOWED, thread_pbbr_nmkp_relay_rx_recv_cb);
     // Register BBR data request URI
     coap_service_register_uri(this->coap_service_id, THREAD_URI_BBR_DATA_REQ, COAP_SERVICE_ACCESS_GET_ALLOWED, thread_pbbr_data_req_recv_cb);
-    coap_service_register_uri(this->coap_service_id, THREAD_URI_BBR_DATA_SET, COAP_SERVICE_ACCESS_GET_ALLOWED, thread_pbbr_data_set_recv_cb);
+    coap_service_register_uri(this->coap_service_id, THREAD_URI_BBR_DATA_SET, COAP_SERVICE_ACCESS_POST_ALLOWED, thread_pbbr_data_set_recv_cb);
+    coap_service_register_uri(this->coap_service_id, THREAD_URI_MGMT_SEC_PENDING_SET, COAP_SERVICE_ACCESS_POST_ALLOWED, thread_pbbr_sec_data_set_recv_cb);
+
 
     // create secure service for Network master key provisioning
     this->coap_nmkp_virtual_service_id = coap_service_initialize(this->interface_id, THREAD_MANAGEMENT_PORT, COAP_SERVICE_OPTIONS_SECURE | COAP_SERVICE_OPTIONS_VIRTUAL_SOCKET, thread_pbbr_pskd_security_start_cb, NULL);
@@ -1182,6 +1224,7 @@ int8_t thread_extension_bbr_init(int8_t interface_id, int8_t backbone_interface_
     this->pbbr_started = false;
     memcpy(this->pbbr_multicast_address, ADDR_LINK_LOCAL_ALL_ROUTERS, 16);
     this->pbbr_port = THREAD_BBR_BACKBONE_PORT;
+    memset(this->registrar_address, 0, 16);
     memcpy(this->tri_address, ADDR_LINK_LOCAL_ALL_ROUTERS, 16);
     this->tri_port = THREAD_BBR_BACKBONE_PORT;
     this->joiner_router_rloc = 0xffff;