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

libs: nexthop comparison includes labels if present

Browse source 
Adjust the nexthop comparison api so that it calls the label-
comparison api. Adjust the label-comp api so that "no labels"
is "equal".

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2019-04-02 12:33:06 -04:00
parent 0931097954
commit 55f93d4b0d
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/nexthop.c
View file

@ -121,12 +121,17 @@ const char *nexthop_type_to_str(enum nexthop_types_t nh_type)
/* /*
* Check if the labels match for the 2 nexthops specified. * Check if the labels match for the 2 nexthops specified.
*/ */
int nexthop_labels_match(struct nexthop *nh1, struct nexthop *nh2) int nexthop_labels_match(const struct nexthop *nh1, const struct nexthop *nh2)
{ {
struct mpls_label_stack *nhl1, *nhl2; const struct mpls_label_stack *nhl1, *nhl2;
nhl1 = nh1->nh_label; nhl1 = nh1->nh_label;
nhl2 = nh2->nh_label; nhl2 = nh2->nh_label;
/* No labels is a match */
if (!nhl1 && !nhl2)
return 1;
if (!nhl1 || !nhl2) if (!nhl1 || !nhl2)
return 0; return 0;
@ -212,7 +217,8 @@ bool nexthop_same(const struct nexthop *nh1, const struct nexthop *nh2)
break; break;
} }
return true; /* Compare labels too (if present) */
return (!!nexthop_labels_match(nh1, nh2));
} }
/* Update nexthop with label information. */ /* Update nexthop with label information. */

6
lib/nexthop.h
View file

@ -143,10 +143,12 @@ extern bool nexthop_same(const struct nexthop *nh1, const struct nexthop *nh2);
extern const char *nexthop_type_to_str(enum nexthop_types_t nh_type); extern const char *nexthop_type_to_str(enum nexthop_types_t nh_type);
extern int nexthop_same_no_recurse(const struct nexthop *next1, extern int nexthop_same_no_recurse(const struct nexthop *next1,
const struct nexthop *next2); const struct nexthop *next2);
extern int nexthop_labels_match(struct nexthop *nh1, struct nexthop *nh2); extern int nexthop_labels_match(const struct nexthop *nh1,
const struct nexthop *nh2);
extern int nexthop_same_firsthop(struct nexthop *next1, struct nexthop *next2); extern int nexthop_same_firsthop(struct nexthop *next1, struct nexthop *next2);
extern const char *nexthop2str(const struct nexthop *nexthop, char *str, int size); extern const char *nexthop2str(const struct nexthop *nexthop,
char *str, int size);
extern struct nexthop *nexthop_next(struct nexthop *nexthop); extern struct nexthop *nexthop_next(struct nexthop *nexthop);
extern unsigned int nexthop_level(struct nexthop *nexthop); extern unsigned int nexthop_level(struct nexthop *nexthop);