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

lib: zapi nexthop sort fixes

Browse Source 
The sorting for zapi nexthops in zapi routes needs to match
the sorting of nexthops done in zebra. Ensure all zapi_nexthop
attributes are included in the sort.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-08-20 14:50:38 -04:00
parent f07254d0f5
commit 38fd3eda40
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/zclient.c
View File

@ -871,6 +871,37 @@ static int zapi_nexthop_cmp_no_labels(const struct zapi_nexthop *next1,
break; break;
} }
if (next1->srte_color < next2->srte_color)
return -1;
if (next1->srte_color > next2->srte_color)
return 1;
if (CHECK_FLAG(next1->flags, NEXTHOP_FLAG_HAS_BACKUP) ||
CHECK_FLAG(next2->flags, NEXTHOP_FLAG_HAS_BACKUP)) {
if (!CHECK_FLAG(next1->flags, NEXTHOP_FLAG_HAS_BACKUP) &&
CHECK_FLAG(next2->flags, NEXTHOP_FLAG_HAS_BACKUP))
return -1;
if (CHECK_FLAG(next1->flags, NEXTHOP_FLAG_HAS_BACKUP) &&
!CHECK_FLAG(next2->flags, NEXTHOP_FLAG_HAS_BACKUP))
return 1;
if (next1->backup_num > 0 || next2->backup_num > 0) {
if (next1->backup_num < next2->backup_num)
return -1;
if (next1->backup_num > next2->backup_num)
return 1;
ret = memcmp(next1->backup_idx,
next2->backup_idx, next1->backup_num);
if (ret != 0)
return ret;
}
}
return 0; return 0;
} }

5
lib/zclient.h
View File

@ -391,6 +391,11 @@ struct zmsghdr {
} __attribute__((packed)); } __attribute__((packed));
#define ZAPI_HEADER_CMD_LOCATION offsetof(struct zmsghdr, command) #define ZAPI_HEADER_CMD_LOCATION offsetof(struct zmsghdr, command)
/*
* ZAPI nexthop. Note that these are sorted when associated with ZAPI routes,
* and that sorting must be aligned with the sorting of nexthops in
* lib/nexthop.c. Any new fields must be accounted for in zapi_nexthop_cmp().
*/
struct zapi_nexthop { struct zapi_nexthop {
enum nexthop_types_t type; enum nexthop_types_t type;
vrf_id_t vrf_id; vrf_id_t vrf_id;