matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: assert if someone adds to nexthop list to nhg

Browse source 
If someone tries to add a nexthop with a list of nexthops
already attached to it, let's just assert. This standardizes
the API to say we assume this is an individual nexthop
you are appending to a group.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
This commit is contained in:
Stephen Worley 2020-01-13 14:28:29 -05:00
parent 1d049aba72
commit 89ca64c90a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/nexthop_group.c
View file

@ -250,8 +250,7 @@ static void _nexthop_add_sorted(struct nexthop **head,
{ {
struct nexthop *position, *prev; struct nexthop *position, *prev;
/* Ensure this gets set */ assert(!nexthop->next);
nexthop->next = NULL;
for (position = *head, prev = NULL; position; for (position = *head, prev = NULL; position;
prev = position, position = position->next) { prev = position, position = position->next) {
@ -281,6 +280,8 @@ void nexthop_group_add_sorted(struct nexthop_group *nhg,
{ {
struct nexthop *tail; struct nexthop *tail;
assert(!nexthop->next);
/* Try to just append to the end first; /* Try to just append to the end first;
* trust the list is already sorted * trust the list is already sorted
*/ */