Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bgpd: Do not start BGP session if BGP identifier is not set (backport) #18017

Merged
merged 1 commit into from
Feb 5, 2025
+18 −1
Merged

bgpd: Do not start BGP session if BGP identifier is not set (backport) #18017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bgpd/bgp_fsm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,7 @@ const char *const peer_down_str[] = {
"Socket Error",
"Admin. shutdown (RTT)",
"Suppress Fib Turned On or Off",
"Router ID is missing",
};

static void bgp_graceful_restart_timer_off(struct peer_connection *connection,
Expand Down
17 changes: 16 additions & 1 deletion bgpd/bgp_network.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ static void bgp_accept(struct event *thread)

/* Do not try to reconnect if the peer reached maximum
* prefixes, restart timer is still running or the peer
* is shutdown.
* is shutdown, or BGP identifier is not set (0.0.0.0).
*/
if (BGP_PEER_START_SUPPRESSED(peer1)) {
if (bgp_debug_neighbor_events(peer1)) {
Expand All @@ -585,6 +585,14 @@ static void bgp_accept(struct event *thread)
return;
}

if (peer1->bgp->router_id.s_addr == INADDR_ANY) {
zlog_warn("[Event] Incoming BGP connection rejected from %s due missing BGP identifier, set it with `bgp router-id`",
peer1->host);
peer1->last_reset = PEER_DOWN_ROUTER_ID_ZERO;
close(bgp_sock);
return;
}

if (bgp_debug_neighbor_events(peer1))
zlog_debug("[Event] connection from %s fd %d, active peer status %d fd %d",
inet_sutop(&su, buf), bgp_sock, connection1->status,
Expand Down Expand Up @@ -770,6 +778,13 @@ int bgp_connect(struct peer_connection *connection)
assert(!CHECK_FLAG(connection->thread_flags, PEER_THREAD_READS_ON));
ifindex_t ifindex = 0;

if (peer->bgp->router_id.s_addr == INADDR_ANY) {
peer->last_reset = PEER_DOWN_ROUTER_ID_ZERO;
zlog_warn("%s: BGP identifier is missing for peer %s, set it with `bgp router-id`",
__func__, peer->host);
return connect_error;
}

if (peer->conf_if && BGP_CONNECTION_SU_UNSPEC(connection)) {
if (bgp_debug_neighbor_events(peer))
zlog_debug("Peer address not learnt: Returning from connect");
Expand Down
1 change: 1 addition & 0 deletions bgpd/bgpd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1768,6 +1768,7 @@ struct peer {
#define PEER_DOWN_SOCKET_ERROR 34U /* Some socket error happened */
#define PEER_DOWN_RTT_SHUTDOWN 35U /* Automatically shutdown due to RTT */
#define PEER_DOWN_SUPPRESS_FIB_PENDING 36U /* Suppress fib pending changed */
#define PEER_DOWN_ROUTER_ID_ZERO 37U /* router-id is 0.0.0.0 */
/*
* Remember to update peer_down_str in bgp_fsm.c when you add
* a new value to the last_reset reason
Expand Down
Loading