address query logic implemented(#1667)

Author: deepakvenugopal

source/6LoWPAN/Thread/thread_extension_bbr.c

@@ -229,7 +229,7 @@ static void thread_border_router_bb_ans_send(thread_pbbr_t *this, uint8_t *desti
     return;
 }
 
-static void thread_border_router_bb_qry_send(thread_pbbr_t *this, uint8_t *target_eid_ptr, uint16_t *rloc_ptr)
+static void thread_border_router_bb_qry_send(thread_pbbr_t *this, const uint8_t *target_eid_ptr, uint16_t *rloc_ptr)
 {
     uint8_t  *ptr;
     uint8_t payload[22];
@@ -446,7 +446,7 @@ static int thread_pbbr_bb_qry_cb(int8_t service_id, uint8_t source_address[16],
     if (!link_configuration_ptr || !cur) {
         return -1;
     }
-    if (addr_is_assigned_to_interface(cur,source_address)) {
+    if (addr_interface_address_compare(cur, source_address) == 0) {
         // Received from own address no need to process
         return 0;
     }
@@ -473,15 +473,57 @@ static int thread_pbbr_bb_qry_cb(int8_t service_id, uint8_t source_address[16],
 
     return 0;
 }
+
+static int thread_pbbr_dua_duplicate_address_detection(int8_t service_id, uint8_t *addr_data_ptr, uint8_t *ml_eid_ptr)
+{
+    thread_pbbr_t *this = thread_border_router_find_by_service(service_id);
+
+    if (!this) {
+        return -1;
+    }
+
+    protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(this->interface_id);
+    duplicate_dua_tr_t *tr_ptr = thread_border_router_dup_tr_find(this->interface_id,addr_data_ptr);
+
+    if (!tr_ptr) {
+        return -1;
+    }
+
+    ipv6_route_t *route = ipv6_route_choose_next_hop(addr_data_ptr, this->interface_id, NULL);
+    if (!route || route->prefix_len != 128 || !route->on_link || route->info.source != ROUTE_THREAD_PROXIED_HOST) {
+        // Not found
+        tr_debug("route not found");
+        return 0;
+    }
+
+    // We have pending request and received answer
+    if (memcmp(ml_eid_ptr,tr_ptr->ml_eid, 8) != 0){
+        // Different ml_eid but same address means duplicate address detected
+        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);
+    }
+    return 0;
+
+    // TODO check last transaction time for migrated device if this answer is newer delete entry
+    // ipv6_route_delete(route->prefix, route->prefix_len, this->interface_id, route->info.next_hop_addr, ROUTE_THREAD_PROXIED_HOST);
+}
+
 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_port;
     (void)request_ptr;
-    uint16_t addr_len, ml_eid_len, last_transaction_time_len, network_name_len;
+    uint16_t addr_len, ml_eid_len, last_transaction_time_len;
     uint8_t *addr_data_ptr;
+    uint16_t rloc16;
+    uint8_t destination_address[16] = {0};
     uint8_t *ml_eid_ptr;
-    uint8_t *network_name_ptr;
     uint32_t last_transaction_time;
     tr_info("Thread BBR BB_ANS.ntf receive");
     thread_pbbr_t *this = thread_border_router_find_by_service(service_id);
@@ -495,54 +537,51 @@ static int thread_pbbr_bb_ans_cb(int8_t service_id, uint8_t source_address[16],
     if (!link_configuration_ptr || !cur) {
         return -1;
     }
-    if (addr_is_assigned_to_interface(cur,source_address)) {
+    if (addr_interface_address_compare(cur, source_address) == 0) {
         // Received from own address no need to process
         return 0;
     }
 
     addr_len = thread_meshcop_tlv_find(request_ptr->payload_ptr, request_ptr->payload_len, TMFCOP_TLV_TARGET_EID, &addr_data_ptr);
     ml_eid_len = thread_meshcop_tlv_find(request_ptr->payload_ptr, request_ptr->payload_len, TMFCOP_TLV_ML_EID, &ml_eid_ptr);
     last_transaction_time_len = thread_meshcop_tlv_data_get_uint32(request_ptr->payload_ptr, request_ptr->payload_len, TMFCOP_TLV_LAST_TRANSACTION_TIME, &last_transaction_time);
-    network_name_len = thread_meshcop_tlv_find(request_ptr->payload_ptr, request_ptr->payload_len, TMFCOP_TLV_LAST_TRANSACTION_TIME, &network_name_ptr);
 
     if ( addr_len < 16|| ml_eid_len < 8 || last_transaction_time_len < 4 ) {
         tr_err("Invalid message");
         return 0;
     }
 
-    // Network name must match
-    if(stringlen((char *)link_configuration_ptr->name,16) != network_name_len || memcmp(link_configuration_ptr->name,network_name_ptr,network_name_len) != 0) {
+    if ((thread_pbbr_dua_duplicate_address_detection(service_id, addr_data_ptr, ml_eid_ptr) == 0)) {
         return 0;
     }
 
-    ipv6_route_t *route = ipv6_route_choose_next_hop(addr_data_ptr, this->interface_id, NULL);
-    if (!route || route->prefix_len != 128 || !route->on_link || route->info.source != ROUTE_THREAD_PROXIED_HOST) {
-        // Not found
+    // If rloc16 is present then a/an is sent to the thread device with the rloc
+    if (thread_tmfcop_tlv_data_get_uint16(request_ptr->payload_ptr, request_ptr->payload_len, TMFCOP_TLV_RLOC16, &rloc16) != 2) {
         return 0;
     }
 
-    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
-        if (memcmp(ml_eid_ptr,tr_ptr->ml_eid, 8) != 0){
-            // Different ml_eid but same address means duplicate address detected
-            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);
-        } else {
-            // Roaming case lets inform other pbbr that we have newest
-            thread_border_router_bb_ans_send(this, source_address, tr_ptr->target_eid, tr_ptr->ml_eid, 0, link_configuration_ptr->name, NULL);
-        }
-    } else {
-        ipv6_route_delete(route->prefix, route->prefix_len, this->interface_id, route->info.next_hop_addr, ROUTE_THREAD_PROXIED_HOST);
-    }
+    // form the destination address to which the a/an is sent
+    thread_addr_write_mesh_local_16(destination_address, rloc16, cur->thread_info);
 
-    // If delayed DUA registration entry is present send duplicate error code to DUA.response
+    // Address query pending send address notification, include tlvs: target eid, rloc16 tlv of bbr, mleid, and last transaction time
+    uint8_t payload[16 + 2 + 8 + 4]; // Target eid + Rloc16 + MLEID + transaction time
+    uint8_t *ptr;
+    ptr = payload;
+    ptr = thread_tmfcop_tlv_data_write(ptr, TMFCOP_TLV_TARGET_EID, 16, addr_data_ptr);
+    ptr = thread_tmfcop_tlv_data_write_uint16(ptr, TMFCOP_TLV_RLOC16, cur->thread_info->routerShortAddress);
+    ptr = thread_tmfcop_tlv_data_write(ptr, TMFCOP_TLV_ML_EID, 8, ml_eid_ptr);
+    ptr = thread_tmfcop_tlv_data_write_uint32(ptr, TMFCOP_TLV_LAST_TRANSACTION_TIME, last_transaction_time);
+
+    // XXX "Accepted" response?
+
+    /* We don't require a response, so we don't specify a callback. Library
+     * should retry itself until it gets an ACK.
+     */
+    coap_service_request_send(this->coap_service_id, COAP_REQUEST_OPTIONS_ADDRESS_SHORT,
+            destination_address, THREAD_MANAGEMENT_PORT,
+                              COAP_MSG_TYPE_CONFIRMABLE, COAP_MSG_CODE_REQUEST_POST,
+                              THREAD_URI_ADDRESS_NOTIFICATION, COAP_CT_OCTET_STREAM,
+                              payload, ptr - payload, NULL);
     return 0;
 }
 static int thread_extension_bbr_bmlr_req_send(int8_t service_id, const uint8_t br_addr[16], const uint8_t *address_ptr, uint8_t addr_len, uint32_t timeout)
@@ -997,7 +1036,7 @@ void thread_extension_bbr_delete(int8_t interface_id)
     ns_dyn_mem_free(this);
 }
 
-bool thread_extension_bbr_nd_query_process(protocol_interface_info_entry_t *cur, const uint8_t *target_addr)
+bool thread_extension_bbr_nd_query_process(protocol_interface_info_entry_t *cur, const uint8_t *target_addr, uint16_t rloc)
 {
     uint8_t domain_prefix[8];
     if (thread_version < THREAD_VERSION_1_2) {
@@ -1010,12 +1049,17 @@ bool thread_extension_bbr_nd_query_process(protocol_interface_info_entry_t *cur,
     if (!this->pbbr_started) {
         return false;
     }
-    // if we have DUA addressing enabled
-    if ( thread_extension_network_prefix_get(cur->id, NULL, domain_prefix, NULL) == 0 &&
-         bitsequal(domain_prefix,target_addr,64) ) {
-        return true;
+    // if we do not have DUA addressing enabled
+    if ( !thread_extension_network_prefix_get(cur->id, NULL, domain_prefix, NULL) == 0 ||
+         !bitsequal(domain_prefix,target_addr,64) ) {
+        return false;
+
     }
-    return false;
+
+    // SEND BB_QRY
+    thread_border_router_bb_qry_send(this,target_addr,&rloc);
+    return true;
+
 }
 
 

source/6LoWPAN/Thread/thread_extension_bbr.h

@@ -41,7 +41,7 @@ extern "C" {
 #ifdef HAVE_THREAD_V2
 int8_t thread_extension_bbr_init(int8_t interface_id, int8_t backbone_interface_id);
 void thread_extension_bbr_delete(int8_t interface_id);
-bool thread_extension_bbr_nd_query_process(protocol_interface_info_entry_t *cur, const uint8_t *target_addr);
+bool thread_extension_bbr_nd_query_process(protocol_interface_info_entry_t *cur, const uint8_t *target_addr, uint16_t rloc);
 void thread_extension_bbr_seconds_timer(int8_t interface_id, uint32_t seconds);
 int thread_extension_bbr_timeout_set(int8_t interface_id, uint32_t timeout_a, uint32_t timeout_b, uint32_t delay);
 int thread_extension_bbr_address_set(int8_t interface_id, const uint8_t *addr_ptr, uint16_t port);
@@ -51,7 +51,7 @@ int thread_extension_bbr_address_set(int8_t interface_id, const uint8_t *addr_pt
 
 #define thread_extension_bbr_init(interface_id, backbone_interface_id)
 #define thread_extension_bbr_delete(interface_id)
-#define thread_extension_bbr_nd_query_process(cur, target_addr) false
+#define thread_extension_bbr_nd_query_process(cur, target_addr, rloc) false
 #define thread_extension_bbr_seconds_timer(interface_id, seconds)
 #define thread_extension_bbr_timeout_set(interface_id, timeout_a, timeout_b, delay)
 #define thread_extension_bbr_address_set(interface_id, addr_ptr, port) (-1)

source/6LoWPAN/Thread/thread_nd.c

@@ -209,7 +209,7 @@ static mle_neigh_table_entry_t *thread_nd_child_mleid_get(int8_t interface_id, u
     return NULL;
 }
 
-static int thread_nd_address_query_lookup(int8_t interface_id, const uint8_t target_addr[static 16], uint16_t *addr_out, bool *proxy, uint32_t *last_transaction_time, uint8_t *mleid_ptr)
+static int thread_nd_address_query_lookup(int8_t interface_id, const uint8_t target_addr[static 16], uint16_t *rloc, uint16_t *addr_out, bool *proxy, uint32_t *last_transaction_time, uint8_t *mleid_ptr)
 {
     protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(interface_id);
     if (!cur) {
@@ -260,8 +260,8 @@ static int thread_nd_address_query_lookup(int8_t interface_id, const uint8_t tar
         can_route_of_mesh = true;
     }
 
-    if (thread_extension_bbr_nd_query_process(cur,target_addr)) {
-        can_route_of_mesh = true;
+    if (thread_extension_bbr_nd_query_process(cur,target_addr, *rloc)){
+        return -1;
     }
 
     if (can_route_of_mesh) {

source/6LoWPAN/Thread/thread_resolution_server.c

@@ -91,6 +91,7 @@ static int thread_resolution_server_query_cb(int8_t service_id, uint8_t source_a
     uint8_t mlEID[8];
     bool proxy;
     uint16_t rloc16;
+    uint16_t requestor_rloc;
     uint32_t last_transaction_time = 0;
     uint8_t *ptr;
     (void)source_port;
@@ -118,9 +119,11 @@ static int thread_resolution_server_query_cb(int8_t service_id, uint8_t source_a
         return -1;
     }
 
+    requestor_rloc = common_read_16_bit(source_address + 14);
+
     tr_debug("Thread address query %s", trace_ipv6(target_ip_ptr));
 
-    int ret = this->query_cb_ptr(this->interface_id, target_ip_ptr, &rloc16, &proxy, &last_transaction_time, mlEID);
+    int ret = this->query_cb_ptr(this->interface_id, target_ip_ptr, &requestor_rloc, &rloc16, &proxy, &last_transaction_time, mlEID);
     if (ret < 0) {
         /* XXX "Forbidden" response? */
         return -1;

source/6LoWPAN/Thread/thread_resolution_server.h

@@ -58,7 +58,7 @@ extern "C" {
  *
  * /return return 0 for success, negative if unable to respond.
  */
-typedef int thread_resolution_server_addr_query_cb(int8_t interface_id, const uint8_t target_addr[static 16], uint16_t *addr_out, bool *proxy, uint32_t *last_transaction_time, uint8_t *mleid_ptr);
+typedef int thread_resolution_server_addr_query_cb(int8_t interface_id, const uint8_t target_addr[static 16], uint16_t *rloc, uint16_t *addr_out, bool *proxy, uint32_t *last_transaction_time, uint8_t *mleid_ptr);
 
 #ifdef HAVE_THREAD_NEIGHBOR_DISCOVERY