Skip to content

Commit 7606ee8

Browse files
author
Juha Heiskanen
committed
Wi-sun NS Aro registration blacklisting update
When NS ARO message send fail we must blacklist device also similar way than at receive NA ARO cache full message. Change-Id: Ib5ad63e7ac6f0c145097df05c01632377ca35055
1 parent e3e5a00 commit 7606ee8

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

source/6LoWPAN/ws/ws_common.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -390,12 +390,10 @@ void ws_common_neighbor_update(protocol_interface_info_entry_t *cur, const uint8
390390
}
391391
}
392392

393-
void ws_common_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *ll_address, bool cache_full)
393+
void ws_common_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *ll_address)
394394
{
395395
tr_warn("ARO registration Failure %s", trace_ipv6(ll_address));
396-
if (cache_full) {
397-
blacklist_update(ll_address, false);
398-
}
396+
blacklist_update(ll_address, false);
399397
ws_bootstrap_aro_failure(cur, ll_address);
400398
}
401399

source/6LoWPAN/ws/ws_common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ void ws_common_fast_timer(protocol_interface_info_entry_t *cur, uint16_t ticks);
137137

138138
void ws_common_neighbor_update(protocol_interface_info_entry_t *cur, const uint8_t *ll_address);
139139

140-
void ws_common_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *ll_address, bool cache_full);
140+
void ws_common_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *ll_address);
141141

142142
void ws_common_neighbor_remove(protocol_interface_info_entry_t *cur, const uint8_t *ll_address);
143143

@@ -155,7 +155,7 @@ uint32_t ws_common_version_timeout_get(uint8_t config);
155155
#define ws_info(cur) ((ws_info_t *) NULL)
156156
#define ws_common_seconds_timer(cur, seconds)
157157
#define ws_common_neighbor_update(cur, ll_address) ((void) 0)
158-
#define ws_common_aro_failure(cur, ll_address, cache_full)
158+
#define ws_common_aro_failure(cur, ll_address)
159159
#define ws_common_neighbor_remove(cur, ll_address)
160160
#define ws_common_fast_timer(cur, ticks) ((void) 0)
161161
#define ws_common_allow_child_registration(cur, eui64) (false)

source/Common_Protocols/icmpv6.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ static void icmpv6_na_wisun_aro_handler(protocol_interface_info_entry_t *cur_int
356356

357357
(void)life_time;
358358
if (nd_status != ARO_SUCCESS) {
359-
ws_common_aro_failure(cur_interface, src_addr, true);
359+
ws_common_aro_failure(cur_interface, src_addr);
360360
}
361361
}
362362

@@ -1389,7 +1389,7 @@ static void icmpv6_aro_cb(buffer_t *buf, uint8_t status)
13891389
}
13901390
rpl_control_address_register_done(buf->interface, ll_address, status);
13911391
if (status != SOCKET_TX_DONE) {
1392-
ws_common_aro_failure(buf->interface, ll_address, false);
1392+
ws_common_aro_failure(buf->interface, ll_address);
13931393
}
13941394
}
13951395

test/nanostack/unittest/stub/ws_common_stub.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,10 @@ bool ws_common_allow_child_registration(protocol_interface_info_entry_t *interfa
6767
(void) interface;
6868
return true;
6969
}
70-
void ws_common_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *ll_address, bool cache_full)
70+
void ws_common_aro_failure(protocol_interface_info_entry_t *cur, const uint8_t *ll_address)
7171
{
7272
(void) cur;
7373
(void) ll_address;
74-
(void) cache_full;
7574
}
7675
void ws_common_neighbor_remove(protocol_interface_info_entry_t *cur, const uint8_t *ll_address)
7776
{

0 commit comments

Comments
 (0)