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

bgpd: Fixes to error message printed for failed peerings

Browse Source 
There was a silly bug introduced when the command to show failed sessions
was added. A missing "," caused the wrong error message to be printed.
Debugging this led down a path that:
   - Led to discovering one more error message that needed to be added
   - Providing the error code along with the string in the JSON output
     to allow programs to key off numbers rather than strings.
   - Fixing the missing ","
   - Changing the error message to "Waiting for Peer IPv6 LLA" to
     make it clear that we're waiting for the link local addr.

Signed-off-by: Dinesh G Dutt <5016467+ddutt@users.noreply.github.com>
This commit is contained in:
Dinesh G Dutt 2019-09-03 19:55:49 +00:00
parent a3aea4ebaf
commit 05912a17e6
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bgpd/bgp_fsm.c
View File

@ -552,10 +552,11 @@ const char *peer_down_str[] = {"",
"Intf peering v6only config change", "Intf peering v6only config change",
"BFD down received", "BFD down received",
"Interface down", "Interface down",
"Neighbor address lost" "Neighbor address lost",
"Waiting for NHT", "Waiting for NHT",
"Waiting for Peer IPv6 Addr", "Waiting for Peer IPv6 LLA",
"Waiting for VRF to be initialized"}; "Waiting for VRF to be initialized",
"No AFI/SAFI activated for peer"};
static int bgp_graceful_restart_timer_expire(struct thread *thread) static int bgp_graceful_restart_timer_expire(struct thread *thread)
{ {

2
bgpd/bgp_vty.c
View File

@ -7921,6 +7921,8 @@ static void bgp_show_peer_reset(struct vty * vty, struct peer *peer,
} }
json_object_string_add(json_peer, "lastResetDueTo", json_object_string_add(json_peer, "lastResetDueTo",
peer_down_str[(int)peer->last_reset]); peer_down_str[(int)peer->last_reset]);
json_object_int_add(json_peer, "lastResetCode",
peer->last_reset);
} else { } else {
if (peer->last_reset == PEER_DOWN_NOTIFY_SEND if (peer->last_reset == PEER_DOWN_NOTIFY_SEND
|| peer->last_reset == PEER_DOWN_NOTIFY_RECEIVED) { || peer->last_reset == PEER_DOWN_NOTIFY_RECEIVED) {

6
bgpd/bgpd.c
View File

@ -1582,6 +1582,12 @@ struct peer *peer_create(union sockunion *su, const char *conf_if,
} }
active = peer_active(peer); active = peer_active(peer);
if (!active) {
if (peer->su.sa.sa_family == AF_UNSPEC)
peer->last_reset = PEER_DOWN_NBR_ADDR;
else
peer->last_reset = PEER_DOWN_NOAFI_ACTIVATED;
}
/* Last read and reset time set */ /* Last read and reset time set */
peer->readtime = peer->resettime = bgp_clock(); peer->readtime = peer->resettime = bgp_clock();

1
bgpd/bgpd.h
View File

@ -1197,6 +1197,7 @@ struct peer {
#define PEER_DOWN_WAITING_NHT 27 /* Waiting for NHT to resolve */ #define PEER_DOWN_WAITING_NHT 27 /* Waiting for NHT to resolve */
#define PEER_DOWN_NBR_ADDR 28 /* Waiting for peer IPv6 IP Addr */ #define PEER_DOWN_NBR_ADDR 28 /* Waiting for peer IPv6 IP Addr */
#define PEER_DOWN_VRF_UNINIT 29 /* Associated VRF is not init yet */ #define PEER_DOWN_VRF_UNINIT 29 /* Associated VRF is not init yet */
#define PEER_DOWN_NOAFI_ACTIVATED 30 /* No AFI/SAFI activated for peer */
size_t last_reset_cause_size; size_t last_reset_cause_size;
uint8_t last_reset_cause[BGP_MAX_PACKET_SIZE]; uint8_t last_reset_cause[BGP_MAX_PACKET_SIZE];