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

lib: Add a couple functions to nexthop_group.c

Browse source 
Add nexthop_group_copy and nexthop_group_add_sorted functions.

nexthop_group_copy -> Copy src nexthop_group into dst nexthop_group
nexthop_group_add_sorted -> Adds a new nexthop to the nexthop group
in a sorted manner.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-09-20 13:59:35 -04:00 committed by Stephen Worley
parent f3afd0a4e1
commit 6c8b51e172
2 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/nexthop_group.c
View file

@ -100,6 +100,12 @@ struct nexthop_group *nexthop_group_new(void)
return XCALLOC(MTYPE_NEXTHOP_GROUP, sizeof(struct nexthop_group));
}
void nexthop_group_copy(struct nexthop_group *to, struct nexthop_group *from)
{
/* Copy everything, including recursive info */
copy_nexthops(&to->nexthop, from->nexthop, NULL);
}
void nexthop_group_delete(struct nexthop_group **nhg)
{
XFREE(MTYPE_NEXTHOP_GROUP, *nhg);
@ -119,6 +125,35 @@ void nexthop_add(struct nexthop **target, struct nexthop *nexthop)
nexthop->prev = last;
}
void nexthop_group_add_sorted(struct nexthop_group *nhg,
struct nexthop *nexthop)
{
struct nexthop *position, *prev;
for (position = nhg->nexthop, prev = NULL; position;
prev = position, position = position->next) {
if (nexthop_cmp(position, nexthop) > 0) {
nexthop->next = position;
nexthop->prev = prev;
if (nexthop->prev)
nexthop->prev->next = nexthop;
else
nhg->nexthop = nexthop;
position->prev = nexthop;
return;
}
}
nexthop->prev = prev;
if (prev)
prev->next = nexthop;
else
nhg->nexthop = nexthop;
}
/* Delete nexthop from a nexthop list. */
void nexthop_del(struct nexthop_group *nhg, struct nexthop *nh)
{

4
lib/nexthop_group.h
View file

@ -43,6 +43,10 @@ struct nexthop_group *nexthop_group_new(void);
void nexthop_group_delete(struct nexthop_group **nhg);
void nexthop_add(struct nexthop **target, struct nexthop *nexthop);
void nexthop_group_add_sorted(struct nexthop_group *nhg,
struct nexthop *nexthop);
void nexthop_group_copy(struct nexthop_group *to,
struct nexthop_group *from);
void nexthop_del(struct nexthop_group *nhg, struct nexthop *nexthop);
void copy_nexthops(struct nexthop **tnh, const struct nexthop *nh,
struct nexthop *rparent);