IPv6 route metrics update (#1912)

Reverts changes made in commit 0a18231
Added metric to aro route.
Added ROUTE_ARO to probe table.
Changed ll address to destination registered address.
Added new flag to probe avoided routers.

Author: deepakvenugopal

source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c

@@ -373,6 +373,7 @@ void protocol_6lowpan_configure_core(protocol_interface_info_entry_t *cur)
     cur->ipv6_neighbour_cache.link_mtu = LOWPAN_MTU;
 #ifdef HAVE_6LOWPAN_ND
     cur->ipv6_neighbour_cache.send_nud_probes = nd_params.send_nud_probes;
+    cur->ipv6_neighbour_cache.probe_avoided_routers = nd_params.send_nud_probes;
     cur->iids_map_to_mac = nd_params.iids_map_to_mac;
 #endif
     cur->ip_multicast_as_mac_unicast_to_parent = false;

source/6LoWPAN/ND/nd_router_object.c

@@ -839,20 +839,13 @@ buffer_t *nd_dar_parse(buffer_t *buf, protocol_interface_info_entry_t *cur_inter
 #ifdef HAVE_6LOWPAN_ROUTER
 static void nd_update_registration(protocol_interface_info_entry_t *cur_interface, ipv6_neighbour_t *neigh, const aro_t *aro)
 {
-    uint8_t ll64[16];
-
-    memcpy(ll64, ADDR_LINK_LOCAL_PREFIX, 8);
-    memcpy(&ll64[8], aro->eui64, 8);
-    ll64[8] ^= 2;
-
-
     /* We are about to send an ARO response - update our Neighbour Cache accordingly */
     if (aro->status == ARO_SUCCESS && aro->lifetime != 0) {
         neigh->type = IP_NEIGHBOUR_REGISTERED;
         neigh->lifetime = aro->lifetime * UINT32_C(60);
         ipv6_neighbour_set_state(&cur_interface->ipv6_neighbour_cache, neigh, IP_NEIGHBOUR_STALE);
         /* Register with 2 seconds off the lifetime - don't want the NCE to expire before the route */
-        ipv6_route_add(neigh->ip_address, 128, cur_interface->id, ll64, ROUTE_ARO, neigh->lifetime - 2, 0);
+        ipv6_route_add_metric(neigh->ip_address, 128, cur_interface->id, neigh->ip_address, ROUTE_ARO, NULL, 0, neigh->lifetime - 2, 32);
 
         /* We need to know peer is a host before publishing - this needs MLE. Not yet established
          * what to do without MLE - might need special external/non-external prioritisation at root.
@@ -871,24 +864,19 @@ static void nd_update_registration(protocol_interface_info_entry_t *cur_interfac
         neigh->type = IP_NEIGHBOUR_TENTATIVE;
         neigh->lifetime = 2;
         ipv6_neighbour_set_state(&cur_interface->ipv6_neighbour_cache, neigh, IP_NEIGHBOUR_STALE);
-        ipv6_route_add(neigh->ip_address, 128, cur_interface->id, ll64, ROUTE_ARO, 4, 0);
+        ipv6_route_add_metric(neigh->ip_address, 128, cur_interface->id, neigh->ip_address, ROUTE_ARO, NULL, 0, 4, 32);
         rpl_control_unpublish_address(protocol_6lowpan_rpl_domain, neigh->ip_address);
     }
 }
 
 void nd_remove_registration(protocol_interface_info_entry_t *cur_interface, addrtype_t ll_type, const uint8_t *ll_address)
 {
-    uint8_t ll64[16];
-
-    memcpy(ll64, ADDR_LINK_LOCAL_PREFIX, 8);
-
     ns_list_foreach_safe(ipv6_neighbour_t, cur, &cur_interface->ipv6_neighbour_cache.list) {
         if ((cur->type == IP_NEIGHBOUR_REGISTERED
                 || cur->type == IP_NEIGHBOUR_TENTATIVE)
                 && ipv6_neighbour_ll_addr_match(cur, ll_type, ll_address)) {
-            memcpy(&ll64[8], ipv6_neighbour_eui64(&cur_interface->ipv6_neighbour_cache, cur), 8);
-            ll64[8] ^= 2;
-            ipv6_route_delete(cur->ip_address, 128, cur_interface->id,ll64,
+
+            ipv6_route_delete(cur->ip_address, 128, cur_interface->id, cur->ip_address,
                               ROUTE_ARO);
             ipv6_neighbour_entry_remove(&cur_interface->ipv6_neighbour_cache,
                                         cur);

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -902,6 +902,7 @@ void thread_interface_init(protocol_interface_info_entry_t *cur)
     cur->if_snoop = thread_nd_snoop;
     cur->if_icmp_handler = thread_nd_icmp_handler;
     cur->ipv6_neighbour_cache.send_nud_probes = false;
+    cur->ipv6_neighbour_cache.probe_avoided_routers = false;
     cur->ipv6_neighbour_cache.recv_addr_reg = true;
     cur->send_mld = false;
     cur->ip_multicast_as_mac_unicast_to_parent = true;
@@ -1514,6 +1515,7 @@ int thread_bootstrap_reset(protocol_interface_info_entry_t *cur)
         cur->thread_info->thread_attached_state = THREAD_STATE_NETWORK_DISCOVER;
     }
     cur->ipv6_neighbour_cache.send_nud_probes = false; //Disable NUD probing
+    cur->ipv6_neighbour_cache.probe_avoided_routers = false;
     cur->ip_multicast_as_mac_unicast_to_parent = true;
     //Define Default Contexts
     if (cur->thread_info->thread_device_mode == THREAD_DEVICE_MODE_SLEEPY_END_DEVICE) {

source/6LoWPAN/ws/ws_bootstrap.c

@@ -638,6 +638,7 @@ static int8_t ws_bootstrap_up(protocol_interface_info_entry_t *cur)
     cur->ipv6_neighbour_cache.omit_aro_success = true;
     /* Disable NUD Probes */
     cur->ipv6_neighbour_cache.send_nud_probes = false;
+    cur->ipv6_neighbour_cache.probe_avoided_routers = true;
     dhcp_client_init(cur->id);
 
     ws_nud_table_reset(cur);

source/ipv6_stack/ipv6_routing_table.c

@@ -172,6 +172,7 @@ void ipv6_neighbour_cache_init(ipv6_neighbour_cache_t *cache, int8_t interface_i
     cache->recv_addr_reg = false;
     cache->send_addr_reg = false;
     cache->send_nud_probes = true;
+    cache->probe_avoided_routers = true;
     cache->recv_na_aro = false;
     cache->recv_ns_aro = false;
     cache->route_if_info.metric = 0;
@@ -1099,6 +1100,7 @@ static const char *route_src_names[] = {
 /* (Others are assumed to be always reachable) */
 static const bool ipv6_route_probing[ROUTE_MAX] = {
     [ROUTE_RADV] = true,
+    [ROUTE_ARO] = true,
     [ROUTE_RPL_DAO] = true,
     [ROUTE_RPL_DIO] = true,
     [ROUTE_RPL_ROOT] = true,
@@ -1225,7 +1227,7 @@ static bool ipv6_route_same_router(const ipv6_route_t *a, const ipv6_route_t *b)
 static void ipv6_route_probe(ipv6_route_t *route)
 {
     ipv6_neighbour_cache_t *ncache = ipv6_neighbour_cache_by_interface_id(route->info.interface_id);
-    if (!ncache || !ncache->send_nud_probes || route->probe_timer) {
+    if (!ncache || !ncache->probe_avoided_routers || route->probe_timer) {
         return;
     }
 
@@ -1378,7 +1380,7 @@ ipv6_route_t *ipv6_route_choose_next_hop(const uint8_t *dest, int8_t interface_i
                 continue;
             }
 
-            if (ncache->send_nud_probes && ipv6_route_probing[route->info.source]) {
+            if (ncache->probe_avoided_routers && ipv6_route_probing[route->info.source]) {
                 /* Going via a router - check reachability, as per RFC 4191.
                  * This only applies for certain routes (currently those from RAs) */
                 reachable = ipv6_neighbour_addr_is_probably_reachable(ncache, route->info.next_hop_addr);

source/ipv6_stack/ipv6_routing_table.h

@@ -119,6 +119,7 @@ typedef struct ipv6_neighbour_cache {
     bool                                    send_addr_reg : 1;
     bool                                    recv_addr_reg : 1;
     bool                                    send_nud_probes : 1;
+    bool                                    probe_avoided_routers : 1;
     bool                                    recv_ns_aro : 1;
     bool                                    recv_na_aro : 1;
     bool                                    use_eui64_as_slla_in_aro : 1;