Merge commit '7197b5fd51825257ee04dac5dfd0d16ea1896853'

* commit '7197b5fd51825257ee04dac5dfd0d16ea1896853':
  Squashed 'features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/' changes from c9bf20f..43c7ec2

Author: deepakvenugopal

features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_interface.h

@@ -987,6 +987,23 @@ void arm_print_protocols2(void (*print_fn)(const char *fmt, ...), char sep);
   *
   */
 extern void net_get_version_information(uint8_t *ptr);
+
+/**
+ * \brief Set buffer size for sleepy device parent.
+ *
+ * This function can be used to set sleepy device parent buffer size and packet threshold.
+ *
+ * Note! In Thread mode parent buffer size is automatically set during Thread initialization.
+ *
+ * \param big_packet_threshold Indicate how long packets are considered big. For Thread, must be 106 bytes.
+ * \param small_packets_per_child_count Number of small packets stored for each sleepy children. For Thread, must be at least 1.
+ * \param big_packets_total_count Total number of big packets parent can store for all sleepy children. For Thread, must be at least 1.
+ * \return 0 on success, <0 on errors.
+ */
+
+extern int arm_nwk_sleepy_device_parent_buffer_size_set(int8_t interface_id, uint16_t big_packet_threshold, uint16_t small_packets_per_child_count, uint16_t big_packets_total_count);
+
+
 #ifdef __cplusplus
 }
 #endif

features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_management_if.h

@@ -74,17 +74,12 @@ typedef struct link_configuration {
     uint8_t master_key[16]; /**< Master key of the thread network*/
     uint8_t PSKc[16]; /**< PSKc value that is calculated from commissioning credentials credentials,XPANID and network name*/
     uint8_t mesh_local_ula_prefix[8]; /**< Mesh local ula prefix*/
-    uint8_t mesh_local_eid[8]; /**< Mesh local extented id*/
     uint8_t extented_pan_id[8]; /**< Extended pan id*/
-    uint8_t extended_random_mac[8]; /**< Extended random mac which is generated during commissioning*/
     uint8_t channel_mask[8]; /**< channel page and mask only supported is page 0*/
     uint8_t channel_page;/**< channel page supported pages 0*/
-    char *PSKc_ptr; /**< Commissioning credentials.  TODO! think if we need the actual credentials*/
-    uint8_t PSKc_len; /**< Length of PSKc */
     uint16_t key_rotation; /**< Key rotation time in hours*/
     uint32_t key_sequence; /**< Key sequence counter */
     uint16_t panId; /**< network id*/
-    uint8_t Protocol_id; /**< current protocol id*/
     uint8_t version; /**< current protocol version*/
     uint16_t rfChannel; /**< current rf channel*/
     uint8_t securityPolicy; /**< Commission Security Policy*/
@@ -108,6 +103,8 @@ typedef struct link_configuration {
  */
 typedef struct {
     uint8_t eui64[8];/**< eui64 of the device. This field is used to identify device when joining to network Mandatory*/
+    uint8_t mesh_local_eid[8]; /**< Mesh local extented id*/
+    uint8_t extended_random_mac[8]; /**< Extended random mac which is generated during commissioning*/
     uint8_t *PSKd_ptr;/**< Device credentials used to authenticate device to commissioner Mandatory  length 6-32*/
     uint8_t PSKd_len;/**< Length of PSKd_ptr*/
     char *provisioning_uri_ptr;/**< Provisioning url max 64 bytes*/
@@ -200,6 +197,22 @@ link_configuration_s *thread_management_configuration_get(int8_t interface_id);
  */
 int thread_management_link_configuration_store(int8_t interface_id, link_configuration_s *link_config);
 
+/** Configure extra TLVs in nanostack .
+ *
+ * Storing is asynchronous operation and this method makes a request to store link
+ * configuration settings. Operation will be completed in the background.
+ * Once settings has been stored the Thread network will be restarted with new
+ * configuration settings.
+ *
+ * /param interface Id of network interface. -1 if interface_id is not available.
+ * /param additional_ptr Pointer to the extra TLV that is to be configured in nanostack
+ * /param additional_len Length of the additional TLV
+ *
+ * /return 0 if store request is successful.
+ * /return < 0 if request is failed.
+ */
+int thread_management_link_configuration_add(int8_t interface_id, uint8_t *additional_ptr, uint8_t additional_len);
+
 /** Delete Thread network link configuration settings.
  *
  * Deletion is asynchronous operation and this method makes a request to delete link
@@ -399,6 +412,34 @@ int thread_management_device_certificate_set(int8_t interface_id, const unsigned
  */
 int thread_management_network_certificate_set(int8_t interface_id, const unsigned char *network_certificate_ptr, uint16_t network_certificate_len, const unsigned char *priv_key_ptr, uint16_t priv_key_len);
 
+/**
+ * Set Thread partition weighting.
+ *
+ * This function sets weighting value for Thread network partition. Interface will be restarted if interface is active and
+ * new weighting value is different than previous weighting value.
+ *
+ * \param interface_id Network interface ID.
+ * \param partition_weighting New weighting value for Thread partition
+ *
+ * \return 0, OK.
+ * \return <0 fail.
+ */
+int thread_management_partition_weighting_set(int8_t interface_id, uint8_t partition_weighting);
+
+/**
+ * Set Thread Sleepy End Device parent packet buffer size.
+ *
+ * This function can be used to adjust count of packets SED parent is storing.
+ *
+ * \param interface_id Network interface ID.
+ * \param small_packets_per_child_count Number of small packets parent is storing for each SED.
+ * \param big_packets_total_count Number of big packets parent can store for all SEDs.
+ *
+ * \return 0, OK.
+ * \return <0 fail.
+ */
+int thread_management_sed_parent_buffer_size_set(int8_t interface_id, uint16_t small_packets_per_child_count, uint16_t big_packets_total_count);
+
 #ifdef __cplusplus
 }
 #endif

features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c

@@ -100,6 +100,7 @@ static void protocol_6lowpan_neighbor_information_remove(int8_t interface_id, ml
 static int8_t protocol_6lowpan_host_challenge(int8_t interface_id, const uint8_t *mac64);
 static int8_t protocol_6lowpan_router_challenge(int8_t interface_id, const uint8_t *mac64);
 static void protocol_6lowpan_address_reg_ready(protocol_interface_info_entry_t *cur_interface);
+static void coordinator_black_list(protocol_interface_info_entry_t *cur);
 
 static mle_6lowpan_data_t *mle_6lowpan_data;
 
@@ -663,17 +664,17 @@ static uint16_t mle_router_synch(protocol_interface_info_entry_t *cur, const uin
     if (retrans) {
         if (destAddress) {
             timeout.retrans_max = 3;
-            timeout.timeout_init = 1;
-            timeout.timeout_max = 3;
+            timeout.timeout_init = 2;
+            timeout.timeout_max = 4;
         } else {
             timeout.retrans_max = 2;
-            timeout.timeout_init = 2;
+            timeout.timeout_init = 4;
             timeout.timeout_max = 4;
         }
     } else {
         timeout.retrans_max = 1;
-        timeout.timeout_init = 1;
-        timeout.timeout_max = 3;
+        timeout.timeout_init = 2;
+        timeout.timeout_max = 4;
     }
 
     timeout.delay = delay;
@@ -706,7 +707,7 @@ static int mle_router_accept_request_build(protocol_interface_info_entry_t *cur,
         bufId =  mle_service_msg_allocate(cur->id, 64, true,type);
         timeout.retrans_max = 2;
         timeout.timeout_init = 2;
-        timeout.timeout_max = 2;
+        timeout.timeout_max = 4;
     }
 
     if (bufId == 0) {
@@ -814,6 +815,7 @@ static bool mle_parent_link_req_cb(int8_t interface_id, uint16_t msgId, bool use
         if (cur->nwk_bootstrap_state == ER_MLE_LINK_REQ) {
             //Enter ND scan
             bootsrap_next_state_kick(ER_SCAN, cur);
+            pan_coordinator_blacklist_free(&cur->pan_cordinator_black_list);
         }
 #ifdef HAVE_RPL
         else if (cur->nwk_bootstrap_state == ER_ROUTER_SYNCH) {
@@ -840,12 +842,19 @@ static bool mle_parent_link_req_cb(int8_t interface_id, uint16_t msgId, bool use
     if (usedAllRetries) {
         switch (cur->nwk_bootstrap_state) {
             case ER_MLE_LINK_REQ:
-            case ER_ROUTER_SYNCH:
             case ER_MLE_LINK_ADDRESS_SYNCH:
             case ER_MLE_LINK_SHORT_SYNCH:
+                if (cur->nwk_bootstrap_state == ER_MLE_LINK_REQ) {
+                    coordinator_black_list(cur);
+                }
                 tr_debug("Link synch fail %u", cur->nwk_bootstrap_state);
                 bootsrap_next_state_kick(ER_BOOTSTRAP_CONNECTION_DOWN, cur);
                 break;
+#ifdef HAVE_RPL
+            case ER_ROUTER_SYNCH:
+                bootsrap_next_state_kick(ER_RPL_MC, cur);
+                break;
+#endif // HAVE_RPL
             default:
                 break;
         }
@@ -869,6 +878,7 @@ static bool mle_accept_request_cb(int8_t interface_id, uint16_t msgId, bool used
         //If message has been sent by MLE service sends MLE reject to clear link
         if (mle_service_check_msg_sent(msgId)) {
             uint8_t *address_ptr = mle_service_get_msg_destination_address_pointer(msgId);
+            tr_debug("No accept for Accept/Request");
             mle_service_reject_message_build(cur->id, address_ptr, false);
         }
         return false;
@@ -2278,15 +2288,8 @@ static void nwk_6lowpan_bootsrap_pana_authentication_start(protocol_interface_in
 
 #endif
 
-static void nwk_6lowpan_network_authentication_fail(protocol_interface_info_entry_t *cur)
+static void coordinator_black_list(protocol_interface_info_entry_t *cur)
 {
-    nwk_scan_params_t *scan_params =
-            &cur->mac_parameters->nwk_scan_params;
-
-    tr_warn("Pana Auhth er");
-
-    scan_params->nwk_cur_active = mac_helper_free_pan_descriptions(scan_params->nwk_cur_active);
-    //Black List coordinator
     uint8_t coord_pan_address[10];
     addrtype_t cord_adr_type = mac_helper_coordinator_address_get(cur, coord_pan_address +2);
 
@@ -2299,6 +2302,18 @@ static void nwk_6lowpan_network_authentication_fail(protocol_interface_info_entr
 
         pan_cordinator_blacklist_pan_set(&cur->pan_cordinator_black_list, coord_pan_address, 300);
     }
+}
+
+static void nwk_6lowpan_network_authentication_fail(protocol_interface_info_entry_t *cur)
+{
+    nwk_scan_params_t *scan_params =
+            &cur->mac_parameters->nwk_scan_params;
+
+    tr_warn("Pana Auhth er");
+
+    scan_params->nwk_cur_active = mac_helper_free_pan_descriptions(scan_params->nwk_cur_active);
+    //Black List coordinator
+    coordinator_black_list(cur);
 
     nwk_bootsrap_state_update(ARM_NWK_AUHTENTICATION_FAIL, cur);
 }
@@ -2374,6 +2389,7 @@ static void nwk_6lowpan_network_authentication_done(protocol_interface_info_entr
             tr_debug("Link request start fail");
         }
 #else
+        pan_coordinator_blacklist_free(&cur->pan_cordinator_black_list);
         cur->nwk_bootstrap_state = ER_SCAN;
         nwk_6lowpan_router_scan_state(cur);
 #endif
@@ -2538,7 +2554,7 @@ void protocol_6lowpan_mac_scan_confirm(int8_t if_id, const mlme_scan_conf_t* con
 
 void bootstrap_timer_handle(uint16_t ticks)
 {
-    ticks;
+    (void)ticks;
     ns_list_foreach(protocol_interface_info_entry_t, cur, &protocol_interface_info_list) {
         if (cur->nwk_id == IF_6LoWPAN) {
             if (cur->nwk_bootstrap_state == ER_ACTIVE_SCAN || cur->nwk_bootstrap_state == ER_WARM_ACTIVE_SCAN) {
@@ -2728,6 +2744,7 @@ static void protocol_6lowpan_generate_link_reject(protocol_interface_info_entry_
         address[8] ^= 2;
     }
     if (mac_helper_default_security_level_get(cur)) {
+        tr_debug("Drop link by asymmetric security");
         mle_service_reject_message_build(cur->id, address, false);
         return;
     }

features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.c

@@ -243,6 +243,7 @@ buffer_t *mesh_up(buffer_t *buf)
     memcpy(buf->dst_sa.address + 2, route.address, route.addr_len);
 
     /* Set src MAC address from our interface */
+    buf->src_sa.addr_type = ADDR_NONE;
     if (!mac_helper_write_our_addr(cur, &buf->src_sa)) {
         goto drop;
     }