proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 16:04:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Add labels_cmp to nexthop_cmp

Browse Source 
Add labels comparison to nexthop_cmp() as well.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
This commit is contained in:
Stephen Worley 2019-05-14 10:39:49 -07:00
parent f932ce865f
commit ff0e16daf9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/nexthop.c
View File

@ -66,8 +66,9 @@ static int nexthop_labels_cmp(const struct nexthop *nh1,
int nexthop_cmp(const struct nexthop *next1, const struct nexthop *next2) int nexthop_cmp(const struct nexthop *next1, const struct nexthop *next2)
{ {
int ret; int ret = 0;
uint32_t n1, n2; uint32_t n1 = 0;
uint32_2 n2 = 0;
if (next1->vrf_id < next2->vrf_id) if (next1->vrf_id < next2->vrf_id)
return -1; return -1;
@ -81,7 +82,7 @@ int nexthop_cmp(const struct nexthop *next1, const struct nexthop *next2)
if (next1->type > next2->type) if (next1->type > next2->type)
return 1; return 1;
switch(next1->type) { switch (next1->type) {
case NEXTHOP_TYPE_IPV4: case NEXTHOP_TYPE_IPV4:
n1 = ntohl(next1->gate.ipv4.s_addr); n1 = ntohl(next1->gate.ipv4.s_addr);
n2 = ntohl(next2->gate.ipv4.s_addr); n2 = ntohl(next2->gate.ipv4.s_addr);
@ -118,6 +119,10 @@ int nexthop_cmp(const struct nexthop *next1, const struct nexthop *next2)
} }
ret = memcmp(&next1->src, &next2->src, sizeof(union g_addr)); ret = memcmp(&next1->src, &next2->src, sizeof(union g_addr));
if (ret)
return ret;
ret = nexthop_labels_cmp(next1, next2);
return ret; return ret;
} }