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

bgpd: Use gracefulRestart JSON field

Browse Source 
Deprecate gracefulRestartCapability which is inconsistent with an existing
format if advertised and received are printed.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2024-11-25 10:42:16 +02:00
parent 0a85b1ba04
commit ee5893ff59
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bgpd/bgp_vty.c
View File

@ -14897,22 +14897,31 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json,
if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_RCV) || if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_RCV) ||
CHECK_FLAG(p->cap, PEER_CAP_RESTART_ADV)) { CHECK_FLAG(p->cap, PEER_CAP_RESTART_ADV)) {
if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_ADV) && if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_ADV) &&
CHECK_FLAG(p->cap, PEER_CAP_RESTART_RCV)) CHECK_FLAG(p->cap, PEER_CAP_RESTART_RCV)) {
json_object_string_add( json_object_string_add(
json_cap, "gracefulRestart", json_cap, "gracefulRestart",
"advertisedAndReceived"); "advertisedAndReceived");
else if (CHECK_FLAG(p->cap, } else if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_ADV)) {
PEER_CAP_RESTART_ADV)) json_object_string_add(json_cap, "gracefulRestart",
"advertised");
#if CONFDATE > 20250525
CPP_NOTICE("Remove `gracefulRestartCapability` JSON field")
#endif
json_object_string_add( json_object_string_add(
json_cap, json_cap,
"gracefulRestartCapability", "gracefulRestartCapability",
"advertised"); "advertised");
else if (CHECK_FLAG(p->cap, } else if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_RCV)) {
PEER_CAP_RESTART_RCV)) json_object_string_add(json_cap, "gracefulRestart",
"received");
#if CONFDATE > 20250525
CPP_NOTICE("Remove `gracefulRestartCapability` JSON field")
#endif
json_object_string_add( json_object_string_add(
json_cap, json_cap,
"gracefulRestartCapability", "gracefulRestartCapability",
"received"); "received");
}
if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_RCV)) { if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_RCV)) {
int restart_af_count = 0; int restart_af_count = 0;