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

Merge pull request #16047 from FRRouting/mergify/bp/stable/10.0/pr-16022

Browse Source 
bgpd: Fix `match peer` when switching between IPv4/IPv6/interface (backport #16022)
This commit is contained in:
Donald Sharp 2024-05-20 15:20:12 -04:00 committed by GitHub
commit 1608b27c5c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bgpd/bgp_routemap.c
View File

@ -5219,27 +5219,23 @@ DEFPY_YANG (match_peer,
nb_cli_enqueue_change(vty, xpath, NB_OP_CREATE, NULL); nb_cli_enqueue_change(vty, xpath, NB_OP_CREATE, NULL);
if (addrv4_str) { snprintf(xpath_value, sizeof(xpath_value),
snprintf( "%s/rmap-match-condition/frr-bgp-route-map:peer-ipv4-address",
xpath_value, sizeof(xpath_value), xpath);
"%s/rmap-match-condition/frr-bgp-route-map:peer-ipv4-address", nb_cli_enqueue_change(vty, xpath_value,
xpath); addrv4_str ? NB_OP_MODIFY : NB_OP_DESTROY,
nb_cli_enqueue_change(vty, xpath_value, NB_OP_MODIFY, addrv4_str);
addrv4_str); snprintf(xpath_value, sizeof(xpath_value),
} else if (addrv6_str) { "%s/rmap-match-condition/frr-bgp-route-map:peer-ipv6-address",
snprintf( xpath);
xpath_value, sizeof(xpath_value), nb_cli_enqueue_change(vty, xpath_value,
"%s/rmap-match-condition/frr-bgp-route-map:peer-ipv6-address", addrv6_str ? NB_OP_MODIFY : NB_OP_DESTROY,
xpath); addrv6_str);
nb_cli_enqueue_change(vty, xpath_value, NB_OP_MODIFY, snprintf(xpath_value, sizeof(xpath_value),
addrv6_str); "%s/rmap-match-condition/frr-bgp-route-map:peer-interface",
} else { xpath);
snprintf( nb_cli_enqueue_change(vty, xpath_value,
xpath_value, sizeof(xpath_value), intf ? NB_OP_MODIFY : NB_OP_DESTROY, intf);
"%s/rmap-match-condition/frr-bgp-route-map:peer-interface",
xpath);
nb_cli_enqueue_change(vty, xpath_value, NB_OP_MODIFY, intf);
}
return nb_cli_apply_changes(vty, NULL); return nb_cli_apply_changes(vty, NULL);
} }