proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-13 21:28:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: make bgpd rely on vrf_bind() API usage

Browse Source 
Instead of relying on local usage of vrf bind operation, the vrf API for
that usage is done.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

fixup bgp
This commit is contained in:
Philippe Guibert 2018-02-05 17:39:37 +01:00
parent 0f4977c668
commit 97896a91c2
1 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
bgpd/bgp_network.c
View File

@ -45,7 +45,7 @@
extern struct zebra_privs_t bgpd_privs; extern struct zebra_privs_t bgpd_privs;
static int bgp_bind(struct peer *); static char *bgp_get_bound_name(struct peer *peer);
/* BGP listening socket. */ /* BGP listening socket. */
struct bgp_listener { struct bgp_listener {
@ -415,7 +415,7 @@ static int bgp_accept(struct thread *thread)
peer->doppelganger = peer1; peer->doppelganger = peer1;
peer1->doppelganger = peer; peer1->doppelganger = peer;
peer->fd = bgp_sock; peer->fd = bgp_sock;
bgp_bind(peer); vrf_bind(peer->bgp->vrf_id, bgp_sock, bgp_get_bound_name(peer));
bgp_fsm_change_status(peer, Active); bgp_fsm_change_status(peer, Active);
BGP_TIMER_OFF(peer->t_start); /* created in peer_create() */ BGP_TIMER_OFF(peer->t_start); /* created in peer_create() */
@ -443,23 +443,20 @@ static int bgp_accept(struct thread *thread)
} }
/* BGP socket bind. */ /* BGP socket bind. */
static int bgp_bind(struct peer *peer) static char *bgp_get_bound_name(struct peer *peer)
{ {
#ifdef SO_BINDTODEVICE
int ret;
int myerrno;
char *name = NULL; char *name = NULL;
/* If not bound to an interface or part of a VRF lite, we don't care. */
if ((peer->bgp->vrf_id == VRF_DEFAULT) && if ((peer->bgp->vrf_id == VRF_DEFAULT) &&
!peer->ifname && !peer->conf_if) !peer->ifname && !peer->conf_if)
return 0; return NULL;
if (vrf_is_mapped_on_netns(peer->bgp->vrf_id))
return 0;
if (peer->su.sa.sa_family != AF_INET if (peer->su.sa.sa_family != AF_INET
&& peer->su.sa.sa_family != AF_INET6) && peer->su.sa.sa_family != AF_INET6)
return 0; // unexpected return NULL; // unexpected
if (!peer)
return name;
/* For IPv6 peering, interface (unnumbered or link-local with interface) /* For IPv6 peering, interface (unnumbered or link-local with interface)
* takes precedence over VRF. For IPv4 peering, explicit interface or * takes precedence over VRF. For IPv4 peering, explicit interface or
* VRF are the situations to bind. * VRF are the situations to bind.
@ -471,30 +468,7 @@ static int bgp_bind(struct peer *peer)
else else
name = peer->ifname ? peer->ifname : peer->bgp->name; name = peer->ifname ? peer->ifname : peer->bgp->name;
if (!name) return name;
return 0;
if (bgp_debug_neighbor_events(peer))
zlog_debug("%s Binding to interface %s", peer->host, name);
if (bgpd_privs.change(ZPRIVS_RAISE))
zlog_err("bgp_bind: could not raise privs");
ret = setsockopt(peer->fd, SOL_SOCKET, SO_BINDTODEVICE, name,
strlen(name));
myerrno = errno;
if (bgpd_privs.change(ZPRIVS_LOWER))
zlog_err("bgp_bind: could not lower privs");
if (ret < 0) {
if (bgp_debug_neighbor_events(peer))
zlog_debug("bind to interface %s failed, errno=%d",
name, myerrno);
return ret;
}
#endif /* SO_BINDTODEVICE */
return 0;
} }
static int bgp_update_address(struct interface *ifp, const union sockunion *dst, static int bgp_update_address(struct interface *ifp, const union sockunion *dst,
@ -571,7 +545,8 @@ int bgp_connect(struct peer *peer)
if (bgpd_privs.change(ZPRIVS_RAISE)) if (bgpd_privs.change(ZPRIVS_RAISE))
zlog_err("Can't raise privileges"); zlog_err("Can't raise privileges");
/* Make socket for the peer. */ /* Make socket for the peer. */
peer->fd = vrf_sockunion_socket(&peer->su, peer->bgp->vrf_id, NULL); peer->fd = vrf_sockunion_socket(&peer->su, peer->bgp->vrf_id,
bgp_get_bound_name(peer));
if (bgpd_privs.change(ZPRIVS_LOWER)) if (bgpd_privs.change(ZPRIVS_LOWER))
zlog_err("Can't lower privileges"); zlog_err("Can't lower privileges");
if (peer->fd < 0) if (peer->fd < 0)
@ -605,9 +580,6 @@ int bgp_connect(struct peer *peer)
if (peer->password) if (peer->password)
bgp_md5_set_connect(peer->fd, &peer->su, peer->password); bgp_md5_set_connect(peer->fd, &peer->su, peer->password);
/* Bind socket. */
bgp_bind(peer);
/* Update source bind. */ /* Update source bind. */
if (bgp_update_source(peer) < 0) { if (bgp_update_source(peer) < 0) {
return connect_error; return connect_error;
@ -751,7 +723,8 @@ int bgp_socket(struct bgp *bgp, unsigned short port, const char *address)
if (bgpd_privs.change(ZPRIVS_RAISE)) if (bgpd_privs.change(ZPRIVS_RAISE))
zlog_err("Can't raise privileges"); zlog_err("Can't raise privileges");
sock = vrf_socket(ainfo->ai_family, ainfo->ai_socktype, sock = vrf_socket(ainfo->ai_family, ainfo->ai_socktype,
ainfo->ai_protocol, bgp->vrf_id, NULL); ainfo->ai_protocol, bgp->vrf_id,
NULL);
if (bgpd_privs.change(ZPRIVS_LOWER)) if (bgpd_privs.change(ZPRIVS_LOWER))
zlog_err("Can't lower privileges"); zlog_err("Can't lower privileges");
if (sock < 0) { if (sock < 0) {