added parent priority handling. (#1942)

Author: deepakvenugopal

nanostack/net_thread_test.h

@@ -541,6 +541,19 @@ int thread_test_extension_name_set(int8_t interface_id, char extension_name[16])
  */
 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

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

@@ -317,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_test_api.c

@@ -1384,3 +1384,27 @@ int thread_test_extension_name_set(int8_t interface_id, char extension_name[16])
     return -1;
 #endif
 }
+
+int thread_test_parent_priority_set(int8_t interface_id, uint8_t parent_priority)
+{
+#ifdef HAVE_THREAD
+    protocol_interface_info_entry_t *cur;
+
+    cur = protocol_stack_interface_info_get_by_id(interface_id);
+    if (!cur) {
+        tr_warn("Invalid interface id");
+        return -1;
+    }
+
+    if (!cur->thread_info) {
+        tr_warn("Not Thread specific interface");
+        return -2;
+    }
+    cur->thread_info->parent_priority = parent_priority;
+    return 0;
+#else
+    (void) interface_id;
+    (void) parent_priority;
+    return -1;
+#endif
+}