proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-30 22:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Show Addpath capability TX/RX flags unconditionally

Browse Source 
It's very annoying when testing and instead of looking for true/false, you
have to check if the field exists.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2024-03-12 21:00:50 +02:00
parent 97f4adfcf9
commit 5f50359c8a
1 changed files with 44 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
bgpd/bgp_vty.c
View File

@ -14127,33 +14127,28 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json,
CHECK_FLAG( CHECK_FLAG(
p->af_cap[afi][safi], p->af_cap[afi][safi],
PEER_CAP_ADDPATH_AF_TX_RCV)) { PEER_CAP_ADDPATH_AF_TX_RCV)) {
if (CHECK_FLAG( json_object_boolean_add(
p->af_cap[afi] json_sub,
"txAdvertisedAndReceived",
CHECK_FLAG(p->af_cap[afi]
[safi], [safi],
PEER_CAP_ADDPATH_AF_TX_ADV) && PEER_CAP_ADDPATH_AF_TX_ADV) &&
CHECK_FLAG( CHECK_FLAG(
p->af_cap[afi] p->af_cap[afi]
[safi], [safi],
PEER_CAP_ADDPATH_AF_TX_RCV)) PEER_CAP_ADDPATH_AF_TX_RCV));
json_object_boolean_true_add(
json_sub, json_object_boolean_add(
"txAdvertisedAndReceived"); json_sub, "txAdvertised",
else if ( CHECK_FLAG(p->af_cap[afi]
CHECK_FLAG(
p->af_cap[afi]
[safi], [safi],
PEER_CAP_ADDPATH_AF_TX_ADV)) PEER_CAP_ADDPATH_AF_TX_ADV));
json_object_boolean_true_add(
json_sub, json_object_boolean_add(
"txAdvertised"); json_sub, "txReceived",
else if ( CHECK_FLAG(p->af_cap[afi]
CHECK_FLAG(
p->af_cap[afi]
[safi], [safi],
PEER_CAP_ADDPATH_AF_TX_RCV)) PEER_CAP_ADDPATH_AF_TX_RCV));
json_object_boolean_true_add(
json_sub,
"txReceived");
} }
if (CHECK_FLAG( if (CHECK_FLAG(
@ -14162,33 +14157,28 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json,
CHECK_FLAG( CHECK_FLAG(
p->af_cap[afi][safi], p->af_cap[afi][safi],
PEER_CAP_ADDPATH_AF_RX_RCV)) { PEER_CAP_ADDPATH_AF_RX_RCV)) {
if (CHECK_FLAG( json_object_boolean_add(
p->af_cap[afi] json_sub,
"rxAdvertisedAndReceived",
CHECK_FLAG(p->af_cap[afi]
[safi], [safi],
PEER_CAP_ADDPATH_AF_RX_ADV) && PEER_CAP_ADDPATH_AF_RX_ADV) &&
CHECK_FLAG( CHECK_FLAG(
p->af_cap[afi] p->af_cap[afi]
[safi], [safi],
PEER_CAP_ADDPATH_AF_RX_RCV)) PEER_CAP_ADDPATH_AF_RX_RCV));
json_object_boolean_true_add(
json_sub, json_object_boolean_add(
"rxAdvertisedAndReceived"); json_sub, "rxAdvertised",
else if ( CHECK_FLAG(p->af_cap[afi]
CHECK_FLAG(
p->af_cap[afi]
[safi], [safi],
PEER_CAP_ADDPATH_AF_RX_ADV)) PEER_CAP_ADDPATH_AF_RX_ADV));
json_object_boolean_true_add(
json_sub, json_object_boolean_add(
"rxAdvertised"); json_sub, "rxReceived",
else if ( CHECK_FLAG(p->af_cap[afi]
CHECK_FLAG(
p->af_cap[afi]
[safi], [safi],
PEER_CAP_ADDPATH_AF_RX_RCV)) PEER_CAP_ADDPATH_AF_RX_RCV));
json_object_boolean_true_add(
json_sub,
"rxReceived");
} }
if (CHECK_FLAG( if (CHECK_FLAG(