riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2783 from BytesGalore/fib_support_all_zero_addr

Browse Source 
net/network_layer/fib: corrected handling of all 0 addresses
This commit is contained in:
Cenk Gündoğan 2015-06-02 11:50:41 +02:00
commit bdc12b05cd
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/net/network_layer/fib/fib.c
View File

@ -100,6 +100,14 @@ static int fib_find_entry(uint8_t *dst, size_t dst_size,
size_t prefix_size = 0; size_t prefix_size = 0;
size_t match_size = dst_size; size_t match_size = dst_size;
int ret = -EHOSTUNREACH; int ret = -EHOSTUNREACH;
bool is_all_zeros_addr = true;
for(size_t i = 0; i < dst_size; ++i) {
if (dst[i] != 0) {
is_all_zeros_addr = false;
break;
}
}
for (size_t i = 0; i < FIB_MAX_FIB_TABLE_ENTRIES; ++i) { for (size_t i = 0; i < FIB_MAX_FIB_TABLE_ENTRIES; ++i) {
@ -133,7 +141,8 @@ static int fib_find_entry(uint8_t *dst, size_t dst_size,
(universal_address_compare(fib_table[i].global, dst, &match_size) == 0)) { (universal_address_compare(fib_table[i].global, dst, &match_size) == 0)) {
/* If we found an exact match */ /* If we found an exact match */
if (match_size == dst_size) { if (match_size == dst_size
|| (is_all_zeros_addr && match_size == 0)) {
entry_arr[0] = &(fib_table[i]); entry_arr[0] = &(fib_table[i]);
*entry_arr_size = 1; *entry_arr_size = 1;
/* we will not find a better one so we return */ /* we will not find a better one so we return */