thread extension fixes. (ARMmbed#1495)

Author: deepakvenugopal

source/6LoWPAN/Thread/thread_bbr_api.c

@@ -943,7 +943,7 @@ void thread_bbr_seconds_timer(int8_t interface_id, uint32_t seconds)
 #endif // HAVE_THREAD_ROUTER
 
 #ifdef HAVE_THREAD_BORDER_ROUTER
-static int thread_bbr_na_send(int8_t interface_id, uint32_t lifetime, const uint8_t target[static 16])
+static int thread_bbr_na_send(int8_t interface_id, const uint8_t target[static 16])
 {
     protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(interface_id);
     if (!cur) {
@@ -970,7 +970,7 @@ int thread_bbr_nd_entry_add (int8_t interface_id, const uint8_t *addr_data_ptr,
         return -2;
     }
     // send NA
-    thread_bbr_na_send(this->backbone_interface_id, lifetime, addr_data_ptr);
+    thread_bbr_na_send(this->backbone_interface_id, addr_data_ptr);
 
     return 0;
 }

source/6LoWPAN/Thread/thread_extension_bbr.c

@@ -52,6 +52,7 @@
 #include "6LoWPAN/Thread/thread_extension_bootstrap.h"
 #include "6LoWPAN/Thread/thread_extension_constants.h"
 #include "6LoWPAN/Thread/thread_bbr_api_internal.h"
+#include "6LoWPAN/Thread/thread_resolution_client.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/ipv6.h"
 
@@ -87,8 +88,9 @@ typedef struct {
 
 typedef struct {
     int8_t interface_id;
+    uint8_t source_address[16];
+    uint8_t ml_eid[8];
     uint8_t target_eid[16];
-    uint16_t request_msg_id;
     uint16_t ttl;
     ns_list_link_t link;
 } duplicate_dua_tr_t;
@@ -152,6 +154,22 @@ static thread_pbbr_t *thread_border_router_find_by_service(int8_t service_id)
     return this;
 }
 
+static duplicate_dua_tr_t *thread_border_router_dup_tr_create(int8_t interface_id, uint8_t *source_addr_ptr, uint8_t *target_eid_ptr, uint8_t *ml_eid_ptr)
+{
+    duplicate_dua_tr_t *this = ns_dyn_mem_alloc(sizeof(duplicate_dua_tr_t));
+
+    if (!this) {
+        return NULL;
+    }
+    ns_list_add_to_start(&duplicate_dua_tr_list, this);
+    this->interface_id = interface_id;
+    memcpy(this->target_eid, target_eid_ptr,16);
+    memcpy(this->source_address, source_addr_ptr, 16);
+    memcpy(this->ml_eid, ml_eid_ptr,8);
+    this->ttl = 2;
+    return this;
+}
+
 static void thread_border_router_dup_tr_delete(duplicate_dua_tr_t *this)
 {
 
@@ -183,7 +201,7 @@ static duplicate_dua_tr_t *thread_border_router_dup_tr_find(int8_t interface_id,
  * DUA Registration Sequence Number TLV
  * Network Name TLV
  */
-static void thread_border_router_bb_ans_send(thread_pbbr_t *this, uint8_t *target_eid_ptr, uint8_t *ml_eid_ptr, uint32_t last_transaction_time, uint8_t *network_name_ptr)
+static void thread_border_router_bb_ans_send(thread_pbbr_t *this, uint8_t *destination_addr_ptr, uint8_t *target_eid_ptr, uint8_t *ml_eid_ptr, uint32_t last_transaction_time, uint8_t *network_name_ptr)
 {
     uint8_t *payload_ptr, *ptr;
 
@@ -201,7 +219,7 @@ static void thread_border_router_bb_ans_send(thread_pbbr_t *this, uint8_t *targe
     ptr = thread_meshcop_tlv_data_write(ptr, TMFCOP_TLV_NETWORK_NAME, stringlen((char *)network_name_ptr, 16), network_name_ptr);
 
     /* UDP Encapsulation TLV */
-    coap_service_request_send(this->br_bb_service_id, COAP_REQUEST_OPTIONS_NONE, this->pbbr_multicast_address, this->pbbr_port,
+    coap_service_request_send(this->br_bb_service_id, COAP_REQUEST_OPTIONS_NONE, destination_addr_ptr, this->pbbr_port,
             COAP_MSG_TYPE_NON_CONFIRMABLE, COAP_MSG_CODE_REQUEST_POST, THREAD_URI_BBR_BB_ANS_NTF, COAP_CT_OCTET_STREAM, payload_ptr, ptr - payload_ptr, NULL);
 
     ns_dyn_mem_free(payload_ptr);
@@ -443,14 +461,13 @@ static int thread_pbbr_bb_qry_cb(int8_t service_id, uint8_t source_address[16],
     uint8_t *ml_eid_ptr = &route->prefix[8];// TODO MLEID needs to be stored in own structure route->info.info and support for dealloc made
 
     // This address is valid in our MESH
-    thread_border_router_bb_ans_send(this, addr_data_ptr, ml_eid_ptr, last_transaction_time, link_configuration_ptr->name);
+    thread_border_router_bb_ans_send(this, source_address, addr_data_ptr, ml_eid_ptr, last_transaction_time, link_configuration_ptr->name);
 
     return 0;
 }
 static int thread_pbbr_bb_ans_cb(int8_t service_id, uint8_t source_address[16], uint16_t source_port, sn_coap_hdr_s *request_ptr)
 {
     (void)service_id;
-    (void)source_address;
     (void)source_port;
     (void)request_ptr;
     uint16_t addr_len, ml_eid_len, last_transaction_time_len, network_name_len;
@@ -499,14 +516,13 @@ static int thread_pbbr_bb_ans_cb(int8_t service_id, uint8_t source_address[16],
     duplicate_dua_tr_t *tr_ptr = thread_border_router_dup_tr_find(this->interface_id,addr_data_ptr);
     if (tr_ptr) {
         // We have pending request and received answer
-        uint8_t *ptr;
-        uint8_t payload[13];
-        ptr = payload;
-        ptr = thread_tmfcop_tlv_data_write_uint8(ptr, TMFCOP_TLV_STATUS, THREAD_BBR_STATUS_DUA_ALREADY_IN_USE);
-        ptr = thread_tmfcop_tlv_data_write(ptr, TMFCOP_TLV_ML_EID, 8, ml_eid_ptr);
-
-        coap_service_response_send_by_msg_id(this->coap_service_id, COAP_REQUEST_OPTIONS_NONE, tr_ptr->request_msg_id, COAP_MSG_CODE_RESPONSE_CHANGED, COAP_CT_OCTET_STREAM, payload, ptr - payload);
-
+        thread_resolution_client_address_error(this->interface_id, tr_ptr->source_address, tr_ptr->target_eid, tr_ptr->ml_eid);
+        ipv6_neighbour_t *neighbour_entry;
+        neighbour_entry = ipv6_neighbour_lookup(&cur->ipv6_neighbour_cache, tr_ptr->target_eid);
+        if (neighbour_entry) {
+            tr_debug("Remove from neigh Cache: %s", tr_ipv6(tr_ptr->target_eid));
+            ipv6_neighbour_entry_remove(&cur->ipv6_neighbour_cache, neighbour_entry);
+        }
     }
     ipv6_route_delete(route->prefix, route->prefix_len, this->interface_id, route->info.next_hop_addr, ROUTE_THREAD_PROXIED_HOST);
 
@@ -611,7 +627,6 @@ static int thread_extension_bbr_bmlr_cb(int8_t service_id, uint8_t source_addres
 
 static int thread_extension_bbr_dua_cb(int8_t service_id, uint8_t source_address[16], uint16_t source_port, sn_coap_hdr_s *request_ptr)
 {
-    (void)source_address;
     (void)source_port;
     uint16_t addr_len, ml_eid_len;
     uint8_t *addr_data_ptr;
@@ -697,11 +712,13 @@ static int thread_extension_bbr_dua_cb(int8_t service_id, uint8_t source_address
 
     if (entry_keep_alive) {
         // send proactive BB_ans.ntf
-        thread_border_router_bb_ans_send(this, addr_data_ptr, ml_eid_ptr, 0, link_configuration_ptr->name);
+        thread_border_router_bb_ans_send(this, this->pbbr_multicast_address, addr_data_ptr, ml_eid_ptr, 0, link_configuration_ptr->name);
     } else {
         // send BB.qry
-        // TODO Delay and replay this meessage and answer the response after 2 seconds passed
+        // TODO Create duplicate Transaction to wait answers from Backbone
+        thread_border_router_dup_tr_create(this->interface_id, source_address, addr_data_ptr, ml_eid_ptr);
         thread_border_router_bb_qry_send(this,addr_data_ptr,NULL);
+
     }
     // TODO
     // Save RLOC to destination cache with Last transaction time. Should these be made as sticky or should I have own table for these?
@@ -785,7 +802,7 @@ static int thread_extension_bbr_pbbr_start(thread_pbbr_t *this)
     // Register Primary BBR backbone multicast address
     memset(this->pbbr_multicast_address, 0, 16);
     this->pbbr_multicast_address[0] = 0xff;
-    this->pbbr_multicast_address[1] = 0x30 | 2; //Thread specification says p and t bits are 1 Scope is 2
+    this->pbbr_multicast_address[1] = 0x30 | 3; //Thread specification says p and t bits are 1 Scope is 3
     this->pbbr_multicast_address[2] = 0x00; //Reserved
     this->pbbr_multicast_address[3] = 0x40; //Prefix length 64 bits
     if (0 != thread_extension_network_prefix_get(this->interface_id, NULL, &this->pbbr_multicast_address[4], NULL)) {
@@ -956,13 +973,9 @@ void thread_extension_bbr_seconds_timer(int8_t interface_id, uint32_t seconds)
     ns_list_foreach_safe(duplicate_dua_tr_t, cur_dup_tr, &duplicate_dua_tr_list) {
         if (cur_dup_tr->interface_id == interface_id && cur_dup_tr->ttl > seconds) {
             cur_dup_tr->ttl -= seconds;
+            // TODO Repeat the ANS 2 times.
         } else {
-            // Timeout
-            uint8_t *ptr;
-            uint8_t payload[3];
-            ptr = payload;
-            ptr = thread_tmfcop_tlv_data_write_uint8(ptr, TMFCOP_TLV_STATUS, THREAD_BBR_STATUS_SUCCESS);
-            coap_service_response_send_by_msg_id(this->coap_service_id, COAP_REQUEST_OPTIONS_NONE, cur_dup_tr->request_msg_id, COAP_MSG_CODE_RESPONSE_CHANGED, COAP_CT_OCTET_STREAM, payload, ptr - payload);
+            // Timeout Remmove the duplicate detection timer
             thread_border_router_dup_tr_delete(cur_dup_tr);
         }
     }