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

Merge pull request #17406 from FRRouting/mergify/bp/stable/9.1/pr-15686

Browse Source 
BGP TCP non established : get port and ip (backport #15686)
This commit is contained in:
Russ White 2024-11-12 10:02:33 -05:00 committed by GitHub
commit c36a1c27c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bgpd/bgp_fsm.c
View File

@ -1800,6 +1800,22 @@ bgp_connect_fail(struct peer_connection *connection)
return bgp_stop(connection); return bgp_stop(connection);
} }
/* after connect is called(), getpeername is able to return
* port and address on non established streams
*/
static void bgp_connect_in_progress_update_connection(struct peer *peer)
{
bgp_getsockname(peer);
if (!peer->su_remote && !BGP_CONNECTION_SU_UNSPEC(peer->connection)) {
/* if connect initiated, then dest port and dest addresses are well known */
peer->su_remote = sockunion_dup(&peer->connection->su);
if (sockunion_family(peer->su_remote) == AF_INET)
peer->su_remote->sin.sin_port = htons(peer->port);
else if (sockunion_family(peer->su_remote) == AF_INET6)
peer->su_remote->sin6.sin6_port = htons(peer->port);
}
}
/* This function is the first starting point of all BGP connection. It /* This function is the first starting point of all BGP connection. It
* try to connect to remote peer with non-blocking IO. * try to connect to remote peer with non-blocking IO.
*/ */
@ -1896,6 +1912,8 @@ static enum bgp_fsm_state_progress bgp_start(struct peer_connection *connection)
__func__, peer->connection->fd); __func__, peer->connection->fd);
return BGP_FSM_FAILURE; return BGP_FSM_FAILURE;
} }
bgp_connect_in_progress_update_connection(peer);
/* /*
* - when the socket becomes ready, poll() will signify POLLOUT * - when the socket becomes ready, poll() will signify POLLOUT
* - if it fails to connect, poll() will signify POLLHUP * - if it fails to connect, poll() will signify POLLHUP

4
bgpd/bgp_network.c
View File

@ -876,11 +876,7 @@ int bgp_getsockname(struct peer *peer)
} }
peer->su_local = sockunion_getsockname(peer->connection->fd); peer->su_local = sockunion_getsockname(peer->connection->fd);
if (!peer->su_local)
return -1;
peer->su_remote = sockunion_getpeername(peer->connection->fd); peer->su_remote = sockunion_getpeername(peer->connection->fd);
if (!peer->su_remote)
return -1;
if (!bgp_zebra_nexthop_set(peer->su_local, peer->su_remote, if (!bgp_zebra_nexthop_set(peer->su_local, peer->su_remote,
&peer->nexthop, peer)) { &peer->nexthop, peer)) {