MTD status check added (#2010)

check for status TLV is address registration
response to MTD added.

Author: deepakvenugopal

source/6LoWPAN/Thread/thread_extension.c

@@ -179,7 +179,7 @@ static int thread_extension_mtd_dua_ntf_cb(int8_t service_id, uint8_t source_add
     (void) response_ptr;
     uint16_t addr_len;
     uint8_t *addr_data_ptr;
-
+    uint8_t dua_status = THREAD_EXTENSION_ST_DUA_SUCCESS;
     tr_debug("Thread MTD n/dn callback");
 
     protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(thread_management_client_get_interface_id_by_service_id(service_id));
@@ -189,12 +189,17 @@ static int thread_extension_mtd_dua_ntf_cb(int8_t service_id, uint8_t source_add
     addr_len = thread_meshcop_tlv_find(response_ptr->payload_ptr, response_ptr->payload_len, TMFCOP_TLV_TARGET_EID, &addr_data_ptr);
 
     if (addr_len < 16) {
-        tr_warn("Invalid target eid in DUA.rsp cb message");
+        tr_warn("Invalid target eid in DUA.ntf cb message");
         return -2;
     }
-    // generate new dua address
-    cur->dad_failures++;
-    thread_extension_dua_address_generate(cur, addr_data_ptr, 64);
+
+    thread_tmfcop_tlv_data_get_uint8(response_ptr->payload_ptr, response_ptr->payload_len, TMFCOP_TLV_STATUS, &dua_status);
+
+    if (dua_status == THREAD_EXTENSION_ST_DUA_DUPLICATE) {
+        // generate new dua address
+        cur->dad_failures++;
+        thread_extension_dua_address_generate(cur, addr_data_ptr, 64);
+    }
 
     return 0;
 }

source/6LoWPAN/Thread/thread_extension_bbr.c

@@ -108,26 +108,6 @@ static NS_LIST_DEFINE(duplicate_dua_tr_list, duplicate_dua_tr_t, link);
 #define THREAD_BBR_DUA_DAD_QUERY_TIMEOUT          1     // wait period for Duplicate Address Detection
 #define THREAD_BBR_DUA_DAD_REPEATS                2     // multicast repeated as part of DUA
 
-/*
-0 – Successful registration
-1 – Registration rejected: Registration Sequence Number is not newer
-2 – Registration rejected: Target EID is not a valid DUA
-3 – Registration rejected: DUA is already in use by another Device
-4 – Registration rejected: BBR resource shortage
-5 – Registration rejected: BBR is not Primary at this moment
-6 – Registration failure: Reason(s) not further specified
-7 – Registration failure: Backbone Link not operational
-*/
-#define THREAD_BBR_STATUS_SUCCESS                   0
-#define THREAD_BBR_STATUS_SEQ_NUMBER_OLD            1
-#define THREAD_BBR_STATUS_TARGET_EID_NOT_VALID      2
-#define THREAD_BBR_STATUS_DUA_ALREADY_IN_USE        3
-#define THREAD_BBR_STATUS_RESOURCE_SHORTAGE         4
-#define THREAD_BBR_STATUS_NOT_PRIMARY_BBR           5
-#define THREAD_BBR_STATUS_NOT_SPECIFIED             6
-#define THREAD_BBR_STATUS_BB_LINK_NOT_OPERATIONAL   7
-
-
 static void thread_border_router_multicast_store_add(thread_pbbr_t *this, uint8_t *destination_addr_ptr);
 static void thread_border_router_multicast_store_del(thread_pbbr_t *this, uint8_t *destination_addr_ptr);
 static void thread_border_router_multicast_store_activate(thread_pbbr_t *this);
@@ -766,7 +746,7 @@ static int thread_extension_bbr_mlr_cb(int8_t service_id, uint8_t source_address
     uint8_t *invalid_addr_ptr = NULL;
     uint32_t timeout_value;
     uint8_t bbr_rloc_addr[16];
-    uint8_t bbr_status = THREAD_BBR_STATUS_SUCCESS;
+    uint8_t bbr_status = THREAD_EXTENSION_ST_DUA_SUCCESS;
     uint8_t payload[4 + 18];
     uint8_t *ptr;
 
@@ -793,7 +773,7 @@ static int thread_extension_bbr_mlr_cb(int8_t service_id, uint8_t source_address
     if (0 != thread_extension_primary_bbr_get(cur, bbr_rloc_addr, NULL, NULL, NULL) ||
             !addr_get_entry(cur, bbr_rloc_addr)) {
         // Primary BBR not present or I am not BBR
-        bbr_status = THREAD_BBR_STATUS_NOT_PRIMARY_BBR;
+        bbr_status = THREAD_EXTENSION_ST_DUA_BBR_NOT_PRIMARY;
         goto send_response;
     }
 
@@ -803,7 +783,7 @@ static int thread_extension_bbr_mlr_cb(int8_t service_id, uint8_t source_address
         tr_info("message from commissioner");
         if (cur->thread_info->registered_commissioner.session_id != session_id) {
             tr_warn("Invalid commissioner session id");
-            bbr_status = THREAD_BBR_STATUS_NOT_SPECIFIED;
+            bbr_status = THREAD_EXTENSION_ST_DUA_GENERAL_FAILURE;
             goto send_response;
         }
         thread_meshcop_tlv_data_get_uint32(request_ptr->payload_ptr, request_ptr->payload_len, TMFCOP_TLV_TIMEOUT, &timeout_value);
@@ -819,15 +799,15 @@ static int thread_extension_bbr_mlr_cb(int8_t service_id, uint8_t source_address
         if (addr_len >= 16) {
             invalid_addr_ptr = addr_ptr;
         }
-        bbr_status = THREAD_BBR_STATUS_TARGET_EID_NOT_VALID;
+        bbr_status = THREAD_EXTENSION_ST_DUA_INVALID;
         goto send_response;
     }
 
     while (remaining > 0) {
         //Go through all addresses
         if (!addr_is_ipv6_multicast(addr_ptr)) {
             tr_err("Invalid /n/mr not multicast address");
-            bbr_status = THREAD_BBR_STATUS_TARGET_EID_NOT_VALID;
+            bbr_status = THREAD_EXTENSION_ST_DUA_INVALID;
             if (!invalid_addr_ptr) {
                 invalid_addr_ptr = addr_ptr;
             }
@@ -887,7 +867,7 @@ static int thread_extension_bbr_dua_cb(int8_t service_id, uint8_t source_address
     uint8_t bbr_rloc_addr[16];
     uint8_t *ptr;
     bool entry_keep_alive = false;
-    uint8_t bbr_status = THREAD_BBR_STATUS_SUCCESS;
+    uint8_t bbr_status = THREAD_EXTENSION_ST_DUA_SUCCESS;
 
     tr_info("Thread BBR DUA.req received");
 
@@ -916,7 +896,7 @@ static int thread_extension_bbr_dua_cb(int8_t service_id, uint8_t source_address
     if (0 == thread_extension_primary_bbr_get(cur, bbr_rloc_addr, NULL, NULL, NULL) &&
             !addr_get_entry(cur, bbr_rloc_addr)) {
         // Primary pBBR present and I am not the pBBR
-        bbr_status = THREAD_BBR_STATUS_NOT_PRIMARY_BBR;
+        bbr_status = THREAD_EXTENSION_ST_DUA_BBR_NOT_PRIMARY;
         goto send_response;
     }
 
@@ -925,14 +905,14 @@ static int thread_extension_bbr_dua_cb(int8_t service_id, uint8_t source_address
 
     if (addr_len < 16 || ml_eid_len < 8) {
         tr_err("Invalid /n/dr message");
-        bbr_status = THREAD_BBR_STATUS_NOT_SPECIFIED;
+        bbr_status = THREAD_EXTENSION_ST_DUA_GENERAL_FAILURE;
         goto send_response;
     }
 
     if (!bitsequal(addr_data_ptr, this->domain_prefix, 64)) {
         // Prefix did not match
         tr_warn("Registration failed invalid address");
-        bbr_status = THREAD_BBR_STATUS_TARGET_EID_NOT_VALID;
+        bbr_status = THREAD_EXTENSION_ST_DUA_INVALID;
         goto send_response;
     }
 
@@ -943,15 +923,15 @@ static int thread_extension_bbr_dua_cb(int8_t service_id, uint8_t source_address
 
     // new device has generated duplicate dua
     if (route != NULL && route->info.info != NULL && memcmp(((thread_pbbr_dua_info_t *)route->info.info)->mleid_ptr, ml_eid_ptr, 8) != 0) {
-        bbr_status = THREAD_BBR_STATUS_DUA_ALREADY_IN_USE;
+        bbr_status = THREAD_EXTENSION_ST_DUA_DUPLICATE;
         goto send_response;
     }
     if (route != NULL && route->info.info != NULL && memcmp(((thread_pbbr_dua_info_t *)route->info.info)->mleid_ptr, ml_eid_ptr, 8) == 0) {
         ((thread_pbbr_dua_info_t *)route->info.info)->last_contact_time = protocol_core_monotonic_time;
         entry_keep_alive = true;
     }
     if (thread_bbr_dua_entry_add(this->interface_id, addr_data_ptr, this->dua_timeout * 2, ml_eid_ptr) != 0) {
-        bbr_status = THREAD_BBR_STATUS_RESOURCE_SHORTAGE;
+        bbr_status = THREAD_EXTENSION_ST_DUA_NO_RESOURCES;
         goto send_response;
     }
     /*if (route && memcmp(route->info.next_hop_addr, ml_addr,16) != 0) {

source/6LoWPAN/Thread/thread_extension_constants.h

@@ -140,6 +140,25 @@ typedef struct discovery_additional_info {
 #define THREAD_EXTENSION_SECURITY_POLICY_NCR_DISABLED       0x40
 #define THREAD_EXTENSION_SECURITY_POLICY_VR_VALUE           0x07
 
+/**
+ * Thread 1.2 Status TLV in DUA.rsp message.
+ * /
+0 – Successful registration
+2 – Registration rejected: Target EID is not a valid DUA; e.g. incorrect Domain Prefix
+3 – Registration rejected: DUA is already in use by another Device
+4 – Registration rejected: BBR resource shortage
+5 – Registration rejected: BBR is not Primary at this moment
+6 – Registration failure: Reason(s) not further specified
+*/
+
+#define THREAD_EXTENSION_ST_DUA_SUCCESS                 0
+#define THREAD_EXTENSION_ST_DUA_INVALID                 2
+#define THREAD_EXTENSION_ST_DUA_DUPLICATE               3
+#define THREAD_EXTENSION_ST_DUA_NO_RESOURCES            4
+#define THREAD_EXTENSION_ST_DUA_BBR_NOT_PRIMARY         5
+#define THREAD_EXTENSION_ST_DUA_GENERAL_FAILURE         6
+
+
 #define THREAD_VERSION_1_2 3
 
 #endif /* THREAD_EXTENSION_CONSTANTS_H_ */