bbr memory leak during keep alive fixed. (ARMmbed#1839)

Author: deepakvenugopal

source/6LoWPAN/Thread/thread_bbr_api.c

@@ -97,6 +97,14 @@ typedef struct {
 #define RFC6106_DNS_SEARCH_LIST_OPTION          31
 static NS_LIST_DEFINE(bbr_instance_list, thread_bbr_t, link);
 
+struct ipv6_route *thread_bbr_dua_entry_find(int8_t interface_id, const uint8_t *addr_data_ptr) {
+    ipv6_route_t *route = ipv6_route_choose_next_hop(addr_data_ptr, interface_id, NULL);
+    if (!route || route->prefix_len < 128 || !route->on_link || route->info.source != ROUTE_THREAD_PROXIED_DUA_HOST ) {
+        //Not found
+        return NULL;
+    }
+    return route;
+}
 
 static thread_bbr_t *thread_bbr_find_by_interface(int8_t interface_id)
 {
@@ -979,25 +987,33 @@ int thread_bbr_nd_entry_add (int8_t interface_id, const uint8_t *addr_data_ptr,
 int thread_bbr_dua_entry_add (int8_t interface_id, const uint8_t *addr_data_ptr,  uint32_t lifetime, const uint8_t *mleid_ptr)
 {
     thread_bbr_t *this = thread_bbr_find_by_interface(interface_id);
+    thread_pbbr_dua_info_t *map;
     if (!this || this->backbone_interface_id < 0) {
         return -1;
     }
-    thread_pbbr_dua_info_t *map = ns_dyn_mem_alloc(sizeof(thread_pbbr_dua_info_t));
-    if (!map) {
-        goto error;
+    ipv6_route_t *route = thread_bbr_dua_entry_find(this->interface_id, addr_data_ptr);
+    if (!route){
+        map = ns_dyn_mem_alloc(sizeof(thread_pbbr_dua_info_t));
+        if (!map) {
+            goto error;
+        }
+        // We are using route info field to store BBR MLEID map
+        route = ipv6_route_add_with_info(addr_data_ptr, 128, interface_id, NULL, ROUTE_THREAD_PROXIED_DUA_HOST, map, 0, lifetime, 0);
+        if (!route) {
+            // Direct route to host allows ND proxying to work
+            ns_dyn_mem_free(map);
+            goto error;
+        }
+        // Route info autofreed
+        route->info_autofree = true;
     }
+
+    map = route->info.info;
     memcpy(map->mleid_ptr, mleid_ptr, 8);
     map->last_contact_time = protocol_core_monotonic_time;
+    route->info.info = map;
+
 
-    // We are using route info field to store BBR MLEID map
-    ipv6_route_t *route = ipv6_route_add_with_info(addr_data_ptr, 128, interface_id, NULL, ROUTE_THREAD_PROXIED_DUA_HOST, map, 0, lifetime, 0);
-    if (!route) {
-        // Direct route to host allows ND proxying to work
-        ns_dyn_mem_free(map);
-        goto error;
-    }
-    // Route info autofreed
-    route->info_autofree = true;
     // send NA
     thread_bbr_na_send(this->backbone_interface_id, addr_data_ptr);
 
@@ -1007,15 +1023,6 @@ int thread_bbr_dua_entry_add (int8_t interface_id, const uint8_t *addr_data_ptr,
     return -2;
 }
 
-struct ipv6_route *thread_bbr_dua_entry_find(int8_t interface_id, const uint8_t *addr_data_ptr) {
-    ipv6_route_t *route = ipv6_route_choose_next_hop(addr_data_ptr, interface_id, NULL);
-    if (!route || route->prefix_len < 128 || !route->on_link || route->info.source != ROUTE_THREAD_PROXIED_DUA_HOST ) {
-        //Not found
-        return NULL;
-    }
-    return route;
-}
-
 int thread_bbr_proxy_state_update(int8_t caller_interface_id , int8_t handler_interface_id, bool status)
 {
     protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(handler_interface_id);

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -2815,7 +2815,7 @@ void thread_bootstrap_network_prefixes_process(protocol_interface_info_entry_t *
                         // don't add
                         tr_debug("Suppressing onlink %s for proxy", trace_ipv6_prefix(curPrefix->servicesPrefix, curPrefix->servicesPrefixLen));
                     } else if (curBorderRouter->P_res1) {
-                        ipv6_route_add(curPrefix->servicesPrefix, curPrefix->servicesPrefixLen, cur->id, NULL, ROUTE_THREAD, 0xffffffff, 0);
+                        ipv6_route_add(curPrefix->servicesPrefix, curPrefix->servicesPrefixLen, cur->id, NULL, ROUTE_THREAD_PROXIED_DUA_HOST, 0xffffffff, 0);
                     } else {
                         //add
                         tr_debug("Adding onlink %s", trace_ipv6_prefix(curPrefix->servicesPrefix, curPrefix->servicesPrefixLen));