d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix IPv4 fib bsearch4() lookup array construction.

Browse Source 
Current code didn't properly handle the case with nested prefixes
 like 10.0.0.0/24 && 10.0.0.0/25.
This commit is contained in:
Alexander V. Chernikov 2021-01-17 19:43:52 +00:00
parent 9d6567bc30
commit f879876721
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/netinet/in_fib_algo.c
View File

@ -360,6 +360,18 @@ bsearch4_process_record(struct bsearch4_array *dst_array,
if (!add_array_entry(dst_array, &new_entry)) if (!add_array_entry(dst_array, &new_entry))
return (false); return (false);
} }
/*
* Special case: adding more specific prefix at the start of
* the previous interval:
* 10.0.0.0(/24,nh=3), 10.0.0.0(/25,nh=4)
* Alter the last record, seeting new nexthop and mask.
*/
if (br_tmp->addr4 == rib_entry->addr4) {
*br_tmp = *rib_entry;
add_array_entry(stack, rib_entry);
return (true);
}
} }
if (!add_array_entry(dst_array, rib_entry)) if (!add_array_entry(dst_array, rib_entry))