Wi-SUN Neighbour ARO registration failure handling update:

Node only black list when status is ARO_FULL othetwise neighbour and RPL candidate is removed.
artokin · Jan 14, 2021 · fde325e · fde325e
1 parent 1e1f9c6
commit fde325e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/source/6LoWPAN/ws/ws_common.c b/source/6LoWPAN/ws/ws_common.c
@@ -530,10 +530,16 @@ void ws_common_neighbor_update(protocol_interface_info_entry_t *cur, const uint8
     }
 }
 
+void ws_common_black_list_neighbour(const uint8_t *ll_address, uint8_t nd_status)
+{
+    if (nd_status == ARO_FULL) {
+        blacklist_update(ll_address, false);
+    }
+}
+
 void ws_common_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *ll_address)
 {
     tr_warn("ARO registration Failure %s", trace_ipv6(ll_address));
-    blacklist_update(ll_address, false);
     ws_bootstrap_aro_failure(cur, ll_address);
 }
 

diff --git a/source/6LoWPAN/ws/ws_common.h b/source/6LoWPAN/ws/ws_common.h
@@ -150,6 +150,8 @@ void ws_common_fast_timer(protocol_interface_info_entry_t *cur, uint16_t ticks);
 
 void ws_common_neighbor_update(protocol_interface_info_entry_t *cur, const uint8_t *ll_address);
 
+void ws_common_black_list_neighbour(const uint8_t *ll_address, uint8_t nd_status);
+
 void ws_common_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *ll_address);
 
 void ws_common_neighbor_remove(protocol_interface_info_entry_t *cur, const uint8_t *ll_address);
@@ -176,6 +178,7 @@ uint8_t ws_common_temporary_entry_size(uint8_t mac_table_size);
 #define ws_info(cur) ((ws_info_t *) NULL)
 #define ws_common_seconds_timer(cur, seconds)
 #define ws_common_neighbor_update(cur, ll_address) ((void) 0)
+#define ws_common_black_list_neighbour(ll_address, nd_status) ((void) 0)
 #define ws_common_aro_failure(cur, ll_address)
 #define ws_common_neighbor_remove(cur, ll_address)
 #define ws_common_fast_timer(cur, ticks) ((void) 0)

diff --git a/source/Common_Protocols/icmpv6.c b/source/Common_Protocols/icmpv6.c
@@ -357,6 +357,7 @@ static void icmpv6_na_wisun_aro_handler(protocol_interface_info_entry_t *cur_int
 
     (void)life_time;
     if (nd_status != ARO_SUCCESS) {
+        ws_common_black_list_neighbour(src_addr, nd_status);
         ws_common_aro_failure(cur_interface, src_addr);
     }
 }
@@ -1447,7 +1448,7 @@ static void icmpv6_aro_cb(buffer_t *buf, uint8_t status)
         ll_address[8] ^= 2;
     }
     if (rpl_control_address_register_done(buf->interface, ll_address, status)) {
-        // When RPL returns true neighbor should be blacklisted
+        // When RPL returns true neighbor should be deleted
         ws_common_aro_failure(buf->interface, ll_address);
     }
 }

diff --git a/test/nanostack/unittest/stub/ws_common_stub.c b/test/nanostack/unittest/stub/ws_common_stub.c
@@ -69,6 +69,13 @@ uint8_t ws_common_allow_child_registration(protocol_interface_info_entry_t *inte
     (void) interface;
     return 0;
 }
+
+void ws_common_black_list_neighbour(const uint8_t *ll_address, uint8_t nd_status)
+{
+    (void) ll_address;
+    (void) nd_status;
+}
+
 void ws_common_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *ll_address)
 {
     (void) cur;