Merge pull request #12212 from donaldsharp/clarify_issue

bgpd: Clarify what NHT error message means
This commit is contained in:
Donatas Abraitis 2022-10-27 18:01:44 +01:00 committed by GitHub
commit 6535ba824b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -601,40 +601,40 @@ void bgp_delayopen_timer(struct thread *thread)
/* BGP Peer Down Cause */ /* BGP Peer Down Cause */
const char *const peer_down_str[] = {"", const char *const peer_down_str[] = {"",
"Router ID changed", "Router ID changed",
"Remote AS changed", "Remote AS changed",
"Local AS change", "Local AS change",
"Cluster ID changed", "Cluster ID changed",
"Confederation identifier changed", "Confederation identifier changed",
"Confederation peer changed", "Confederation peer changed",
"RR client config change", "RR client config change",
"RS client config change", "RS client config change",
"Update source change", "Update source change",
"Address family activated", "Address family activated",
"Admin. shutdown", "Admin. shutdown",
"User reset", "User reset",
"BGP Notification received", "BGP Notification received",
"BGP Notification send", "BGP Notification send",
"Peer closed the session", "Peer closed the session",
"Neighbor deleted", "Neighbor deleted",
"Peer-group add member", "Peer-group add member",
"Peer-group delete member", "Peer-group delete member",
"Capability changed", "Capability changed",
"Passive config change", "Passive config change",
"Multihop config change", "Multihop config change",
"NSF peer closed the session", "NSF peer closed the session",
"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", "No path to specified Neighbor",
"Waiting for Peer IPv6 LLA", "Waiting for Peer IPv6 LLA",
"Waiting for VRF to be initialized", "Waiting for VRF to be initialized",
"No AFI/SAFI activated for peer", "No AFI/SAFI activated for peer",
"AS Set config change", "AS Set config change",
"Waiting for peer OPEN", "Waiting for peer OPEN",
"Reached received prefix count", "Reached received prefix count",
"Socket Error"}; "Socket Error"};
static void bgp_graceful_restart_timer_off(struct peer *peer) static void bgp_graceful_restart_timer_off(struct peer *peer)
{ {
@ -1880,8 +1880,9 @@ int bgp_start(struct peer *peer)
if (!bgp_peer_reg_with_nht(peer)) { if (!bgp_peer_reg_with_nht(peer)) {
if (bgp_zebra_num_connects()) { if (bgp_zebra_num_connects()) {
if (bgp_debug_neighbor_events(peer)) if (bgp_debug_neighbor_events(peer))
zlog_debug("%s [FSM] Waiting for NHT", zlog_debug(
peer->host); "%s [FSM] Waiting for NHT, no path to neighbor present",
peer->host);
peer->last_reset = PEER_DOWN_WAITING_NHT; peer->last_reset = PEER_DOWN_WAITING_NHT;
BGP_EVENT_ADD(peer, TCP_connection_open_failed); BGP_EVENT_ADD(peer, TCP_connection_open_failed);
return 0; return 0;