thread address handling updated. (ARMmbed#1496)

Author: deepakvenugopal

source/6LoWPAN/Thread/thread_extension_bbr.c

@@ -516,15 +516,23 @@ 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
-        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);
+        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);
         }
+    } else {
+        ipv6_route_delete(route->prefix, route->prefix_len, this->interface_id, route->info.next_hop_addr, ROUTE_THREAD_PROXIED_HOST);
     }
-    ipv6_route_delete(route->prefix, route->prefix_len, this->interface_id, route->info.next_hop_addr, ROUTE_THREAD_PROXIED_HOST);
 
     // If delayed DUA registration entry is present send duplicate error code to DUA.response
     return 0;
@@ -665,9 +673,9 @@ static int thread_extension_bbr_dua_cb(int8_t service_id, uint8_t source_address
     }
     */
     protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(this->interface_id);
-    if (0 != thread_extension_primary_bbr_get(cur, bbr_rloc_addr, NULL, NULL, NULL) ||
+    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
+        // Primary pBBR present and I am not the pBBR
         bbr_status = THREAD_BBR_STATUS_NOT_PRIMARY_BBR;
         goto send_response;
     }