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

Merge pull request #14147 from idryzhov/static-fix-nexthop-vrf

Browse Source 
staticd: fix comparison of nexthop-vrf
This commit is contained in:
Mark Stapp 2023-08-04 15:09:39 -04:00 committed by GitHub
commit a593a319f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
staticd/static_vty.c
View File

@ -1374,6 +1374,7 @@ int static_nexthop_cli_cmp(const struct lyd_node *dnode1,
{ {
enum static_nh_type nh_type1, nh_type2; enum static_nh_type nh_type1, nh_type2;
struct prefix prefix1, prefix2; struct prefix prefix1, prefix2;
const char *vrf1, *vrf2;
int ret = 0; int ret = 0;
nh_type1 = yang_dnode_get_enum(dnode1, "./nh-type"); nh_type1 = yang_dnode_get_enum(dnode1, "./nh-type");
@ -1413,8 +1414,14 @@ int static_nexthop_cli_cmp(const struct lyd_node *dnode1,
if (ret) if (ret)
return ret; return ret;
return if_cmp_name_func(yang_dnode_get_string(dnode1, "./vrf"), vrf1 = yang_dnode_get_string(dnode1, "./vrf");
yang_dnode_get_string(dnode2, "./vrf")); if (strmatch(vrf1, "default"))
vrf1 = "";
vrf2 = yang_dnode_get_string(dnode2, "./vrf");
if (strmatch(vrf2, "default"))
vrf2 = "";
return if_cmp_name_func(vrf1, vrf2);
} }
int static_route_list_cli_cmp(const struct lyd_node *dnode1, int static_route_list_cli_cmp(const struct lyd_node *dnode1,