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

BGP: Restart the BGP FSM if update source fails.

Browse Source 
For IPv6, update source sometimes fails at the first attempt. If we continue
ignoring the error, some sessions will not come up. If instead we check for
the error and return connect_error, the FSM will reset its state and try again
till the update source bind succeeds and the session will come up.

This patch adds checking for the result of bind and update_source to return
connect_error or success. The rest of the code handles the situation correctly
after that.

Signed-off-by: Dinesh G Dutt <ddutt@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by:   Vivek Venkataraman <vivek@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2015-06-12 07:59:11 -07:00
parent ed40466af8
commit 490674967f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bgpd/bgp_network.c
View File

@ -416,28 +416,31 @@ bgp_update_address (struct interface *ifp, const union sockunion *dst,
}
/* Update source selection. */
static void
static int
bgp_update_source (struct peer *peer)
{
struct interface *ifp;
union sockunion addr;
int ret = 0;
/* Source is specified with interface name. */
if (peer->update_if)
{
ifp = if_lookup_by_name (peer->update_if);
if (! ifp)
return;
return -1;
if (bgp_update_address (ifp, &peer->su, &addr))
return;
return -1;
sockunion_bind (peer->fd, &addr, 0, &addr);
ret = sockunion_bind (peer->fd, &addr, 0, &addr);
}
/* Source is specified with IP address. */
if (peer->update_source)
sockunion_bind (peer->fd, peer->update_source, 0, peer->update_source);
ret = sockunion_bind (peer->fd, peer->update_source, 0, peer->update_source);
return ret;
}
#define DATAPLANE_MARK 254 /* main table ID */
@ -492,7 +495,10 @@ bgp_connect (struct peer *peer)
bgp_bind (peer);
/* Update source bind. */
bgp_update_source (peer);
if (bgp_update_source (peer) < 0)
{
return connect_error;
}
#ifdef HAVE_IPV6
if (peer->conf_if || peer->ifname)