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

Merge pull request #5783 from ton31337/fix/bad_formatting_bgpd_gr

Browse Source 
bgpd: Format properly `show bgp neighbors` for graceful restart stuff
This commit is contained in:
Russ White 2020-02-25 11:01:27 -05:00 committed by GitHub
commit 5e34d224ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
bgpd/bgp_vty.c
View File

@ -9443,7 +9443,7 @@ static void bgp_show_neighnor_graceful_restart_rbit(struct vty *vty,
bool rbit_status = 0;
if (!use_json)
vty_out(vty, "\n R bit : ");
vty_out(vty, "\n R bit: ");
if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_ADV)
&& (CHECK_FLAG(p->cap, PEER_CAP_RESTART_RCV))
@ -9476,7 +9476,7 @@ static void bgp_show_neighbor_graceful_restart_remote_mode(struct vty *vty,
const char *mode = "NotApplicable";
if (!use_json)
vty_out(vty, "\n Remote GR Mode : ");
vty_out(vty, "\n Remote GR Mode: ");
if (CHECK_FLAG(peer->cap, PEER_CAP_RESTART_ADV)
&& (peer->status == Established)) {
@ -9512,7 +9512,7 @@ static void bgp_show_neighbor_graceful_restart_local_mode(struct vty *vty,
const char *mode = "Invalid";
if (!use_json)
vty_out(vty, " Local GR Mode : ");
vty_out(vty, " Local GR Mode: ");
if (bgp_peer_gr_mode_get(p) == PEER_HELPER)
mode = "Helper";
@ -9570,10 +9570,10 @@ static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi(
eor_flag = false;
if (!use_json) {
vty_out(vty, " %s :\n",
vty_out(vty, " %s:\n",
get_afi_safi_str(afi, safi, false));
vty_out(vty, " F bit : ");
vty_out(vty, " F bit: ");
}
if (peer->nsf[afi][safi]
@ -9594,7 +9594,41 @@ static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi(
}
if (!use_json)
vty_out(vty, " End-of-RIB Received : ");
vty_out(vty, " End-of-RIB sent: ");
if (CHECK_FLAG(peer->af_sflags[afi][safi],
PEER_STATUS_EOR_SEND)) {
if (use_json) {
json_object_boolean_true_add(
json_endofrib_status,
"endOfRibSend");
PRINT_EOR_JSON(eor_flag);
} else {
vty_out(vty, "Yes\n");
vty_out(vty,
" End-of-RIB sent after update: ");
PRINT_EOR(eor_flag);
}
} else {
if (use_json) {
json_object_boolean_false_add(
json_endofrib_status,
"endOfRibSend");
json_object_boolean_false_add(
json_endofrib_status,
"endOfRibSentAfterUpdate");
} else {
vty_out(vty, "No\n");
vty_out(vty,
" End-of-RIB sent after update: ");
vty_out(vty, "No\n");
}
}
if (!use_json)
vty_out(vty, " End-of-RIB received: ");
if (CHECK_FLAG(peer->af_sflags[afi][safi],
PEER_STATUS_EOR_RECEIVED)) {
@ -9613,40 +9647,6 @@ static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi(
vty_out(vty, "No\n");
}
if (!use_json)
vty_out(vty, " End-of-RIB Send : ");
if (CHECK_FLAG(peer->af_sflags[afi][safi],
PEER_STATUS_EOR_SEND)) {
if (use_json) {
json_object_boolean_true_add(
json_endofrib_status,
"endOfRibSend");
PRINT_EOR_JSON(eor_flag);
} else {
vty_out(vty, "Yes\n");
vty_out(vty,
" EoRSentAfterUpdate : ");
PRINT_EOR(eor_flag);
}
} else {
if (use_json) {
json_object_boolean_false_add(
json_endofrib_status,
"endOfRibSend");
json_object_boolean_false_add(
json_endofrib_status,
"endOfRibSentAfterUpdate");
} else {
vty_out(vty, "No\n");
vty_out(vty,
" EoRSentAfterUpdate : ");
vty_out(vty, "No\n");
}
}
if (use_json) {
json_object_int_add(json_timer,
"stalePathTimer",
@ -9686,46 +9686,36 @@ static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi(
.t_select_deferral));
}
} else {
vty_out(vty, " Timers:\n");
vty_out(vty, "%*s", 6, "");
vty_out(vty, " Timers:\n");
vty_out(vty,
"Configured Stale Path Time(sec)%*s: %u\n",
8, "", peer->bgp->stalepath_time);
" Configured Stale Path Time(sec): %u\n",
peer->bgp->stalepath_time);
if (peer->t_gr_stale != NULL) {
vty_out(vty, "%*s", 6, "");
if (peer->t_gr_stale != NULL)
vty_out(vty,
"Stale Path Remaining(sec)%*s: %ld\n",
14, "",
" Stale Path Remaining(sec): %ld\n",
thread_timer_remain_second(
peer->t_gr_stale));
}
/* Display Configured Selection
* Deferral only when when
* Gr mode is enabled.
*/
if (CHECK_FLAG(peer->flags,
PEER_FLAG_GRACEFUL_RESTART)) {
vty_out(vty, "%*s", 6, "");
PEER_FLAG_GRACEFUL_RESTART))
vty_out(vty,
"Configured Selection Deferral Time(sec): %u\n",
" Configured Selection Deferral Time(sec): %u\n",
peer->bgp->select_defer_time);
}
if (peer->bgp->gr_info[afi][safi]
.t_select_deferral
!= NULL) {
vty_out(vty, "%*s", 6, "");
!= NULL)
vty_out(vty,
"Selection Deferral Time Remaining(sec) : %ld\n",
" Selection Deferral Time Remaining(sec): %ld\n",
thread_timer_remain_second(
peer->bgp
->gr_info[afi]
[safi]
.t_select_deferral));
}
}
if (use_json) {
json_object_object_add(json_afi_safi,
@ -9765,19 +9755,17 @@ static void bgp_show_neighbor_graceful_restart_time(struct vty *vty,
json_object_object_add(json, "timers", json_timer);
} else {
vty_out(vty, " Timers :\n");
vty_out(vty, " Configured Restart Time(sec) : %u\n",
vty_out(vty, " Timers:\n");
vty_out(vty, " Configured Restart Time(sec): %u\n",
p->bgp->restart_time);
vty_out(vty, " Received Restart Time(sec) : %u\n",
vty_out(vty, " Received Restart Time(sec): %u\n",
p->v_gr_restart);
if (p->t_gr_restart != NULL)
vty_out(vty,
" Restart Time Remaining(sec) : %ld\n",
vty_out(vty, " Restart Time Remaining(sec): %ld\n",
thread_timer_remain_second(p->t_gr_restart));
if (p->t_gr_restart != NULL) {
vty_out(vty,
" Restart Time Remaining(sec) : %ld\n",
vty_out(vty, " Restart Time Remaining(sec): %ld\n",
thread_timer_remain_second(p->t_gr_restart));
}
}