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

Merge pull request #10357 from ton31337/fix/peer_address_self_check_relax

Browse Source 
bgpd: Relax peer to be on the same host
This commit is contained in:
Russ White 2022-01-28 11:12:45 -05:00 committed by GitHub
commit 80dae7afbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bgpd/bgp_network.c
View File

@ -52,15 +52,6 @@ extern struct zebra_privs_t bgpd_privs;
static char *bgp_get_bound_name(struct peer *peer); static char *bgp_get_bound_name(struct peer *peer);
/* BGP listening socket. */
struct bgp_listener {
int fd;
union sockunion su;
struct thread *thread;
struct bgp *bgp;
char *name;
};
void bgp_dump_listener_info(struct vty *vty) void bgp_dump_listener_info(struct vty *vty)
{ {
struct listnode *node; struct listnode *node;

8
bgpd/bgp_network.h
View File

@ -23,6 +23,14 @@
#define BGP_SOCKET_SNDBUF_SIZE 65536 #define BGP_SOCKET_SNDBUF_SIZE 65536
struct bgp_listener {
int fd;
union sockunion su;
struct thread *thread;
struct bgp *bgp;
char *name;
};
extern void bgp_dump_listener_info(struct vty *vty); extern void bgp_dump_listener_info(struct vty *vty);
extern int bgp_socket(struct bgp *bgp, unsigned short port, extern int bgp_socket(struct bgp *bgp, unsigned short port,
const char *address); const char *address);

27
bgpd/bgp_vty.c
View File

@ -54,6 +54,7 @@
#include "bgpd/bgp_errors.h" #include "bgpd/bgp_errors.h"
#include "bgpd/bgp_fsm.h" #include "bgpd/bgp_fsm.h"
#include "bgpd/bgp_nexthop.h" #include "bgpd/bgp_nexthop.h"
#include "bgpd/bgp_network.h"
#include "bgpd/bgp_open.h" #include "bgpd/bgp_open.h"
#include "bgpd/bgp_regex.h" #include "bgpd/bgp_regex.h"
#include "bgpd/bgp_route.h" #include "bgpd/bgp_route.h"
@ -683,16 +684,34 @@ int bgp_vty_find_and_parse_afi_safi_bgp(struct vty *vty,
static bool peer_address_self_check(struct bgp *bgp, union sockunion *su) static bool peer_address_self_check(struct bgp *bgp, union sockunion *su)
{ {
struct interface *ifp = NULL; struct interface *ifp = NULL;
struct listnode *node;
struct bgp_listener *listener;
union sockunion all_su;
if (su->sa.sa_family == AF_INET) if (su->sa.sa_family == AF_INET) {
str2sockunion("0.0.0.0", &all_su);
ifp = if_lookup_by_ipv4_exact(&su->sin.sin_addr, bgp->vrf_id); ifp = if_lookup_by_ipv4_exact(&su->sin.sin_addr, bgp->vrf_id);
else if (su->sa.sa_family == AF_INET6) } else if (su->sa.sa_family == AF_INET6) {
str2sockunion("::", &all_su);
ifp = if_lookup_by_ipv6_exact(&su->sin6.sin6_addr, ifp = if_lookup_by_ipv6_exact(&su->sin6.sin6_addr,
su->sin6.sin6_scope_id, su->sin6.sin6_scope_id,
bgp->vrf_id); bgp->vrf_id);
}
if (ifp) if (ifp) {
return true; for (ALL_LIST_ELEMENTS_RO(bm->listen_sockets, node, listener)) {
if (sockunion_family(su) !=
sockunion_family(&listener->su))
continue;
/* If 0.0.0.0/:: is a listener, then treat as self and
* reject.
*/
if (!sockunion_cmp(&listener->su, su) ||
!sockunion_cmp(&listener->su, &all_su))
return true;
}
}
return false; return false;
} }