proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 08:23:56 +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

98
bgpd/bgp_vty.c
View File

@ -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",
@ -9687,37 +9687,28 @@ static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi(
}
} else {
vty_out(vty, " Timers:\n");
vty_out(vty, "%*s", 6, "");
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",
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",
thread_timer_remain_second(
@ -9726,7 +9717,6 @@ static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi(
[safi]
.t_select_deferral));
}
}
if (use_json) {
json_object_object_add(json_afi_safi,
"endOfRibStatus",
@ -9772,12 +9762,10 @@ static void bgp_show_neighbor_graceful_restart_time(struct vty *vty,
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));
}
}