proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-13 21:28:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: test vrfs in nexthop_same_firsthop()

Browse Source 
Test the two nexthops' vrfs, and convert api to 'bool' return.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-05-26 11:08:42 -04:00
parent 65d413f4a0
commit 0e8542eef3
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/nexthop.c
View File

@ -187,35 +187,41 @@ int nexthop_cmp(const struct nexthop *next1, const struct nexthop *next2)
return ret;
}
int nexthop_same_firsthop(struct nexthop *next1, struct nexthop *next2)
bool nexthop_same_firsthop(const struct nexthop *next1,
const struct nexthop *next2)
{
/* Map the TYPE_IPx types to TYPE_IPx_IFINDEX */
int type1 = NEXTHOP_FIRSTHOPTYPE(next1->type);
int type2 = NEXTHOP_FIRSTHOPTYPE(next2->type);
if (type1 != type2)
return 0;
return false;
if (next1->vrf_id != next2->vrf_id)
return false;
switch (type1) {
case NEXTHOP_TYPE_IPV4_IFINDEX:
if (!IPV4_ADDR_SAME(&next1->gate.ipv4, &next2->gate.ipv4))
return 0;
return false;
if (next1->ifindex != next2->ifindex)
return 0;
return false;
break;
case NEXTHOP_TYPE_IFINDEX:
if (next1->ifindex != next2->ifindex)
return 0;
return false;
break;
case NEXTHOP_TYPE_IPV6_IFINDEX:
if (!IPV6_ADDR_SAME(&next1->gate.ipv6, &next2->gate.ipv6))
return 0;
return false;
if (next1->ifindex != next2->ifindex)
return 0;
return false;
break;
default:
/* do nothing */
break;
}
return 1;
return true;
}
/*

3
lib/nexthop.h
View File

@ -208,7 +208,8 @@ extern int nexthop_g_addr_cmp(enum nexthop_types_t type,
extern const char *nexthop_type_to_str(enum nexthop_types_t nh_type);
extern bool nexthop_labels_match(const struct nexthop *nh1,
const struct nexthop *nh2);
extern int nexthop_same_firsthop(struct nexthop *next1, struct nexthop *next2);
extern bool nexthop_same_firsthop(const struct nexthop *next1,
const struct nexthop *next2);
extern const char *nexthop2str(const struct nexthop *nexthop,
char *str, int size);