diff options
| author | Russ White <russ@riw.us> | 2022-01-28 11:12:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-28 11:12:45 -0500 |
| commit | 80dae7afbe418a6bbd08311a05a1abf347c17b1f (patch) | |
| tree | f7db98cb39cb36e4ccc1cbf87ed5b01eca66c130 | |
| parent | 7a90d91586290d872c05960427df2d3f031cc5e5 (diff) | |
| parent | 4122b697bbe16dc90a56e4d5597a203a7d31a494 (diff) | |
Merge pull request #10357 from ton31337/fix/peer_address_self_check_relax
bgpd: Relax peer to be on the same host
| -rw-r--r-- | bgpd/bgp_network.c | 9 | ||||
| -rw-r--r-- | bgpd/bgp_network.h | 8 | ||||
| -rw-r--r-- | bgpd/bgp_vty.c | 27 |
3 files changed, 31 insertions, 13 deletions
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c index 09abb69968..3fb7619ed1 100644 --- a/bgpd/bgp_network.c +++ b/bgpd/bgp_network.c @@ -52,15 +52,6 @@ extern struct zebra_privs_t bgpd_privs; 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) { struct listnode *node; diff --git a/bgpd/bgp_network.h b/bgpd/bgp_network.h index 0b5cc17523..22e34110bc 100644 --- a/bgpd/bgp_network.h +++ b/bgpd/bgp_network.h @@ -23,6 +23,14 @@ #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 int bgp_socket(struct bgp *bgp, unsigned short port, const char *address); diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 4d9630f67f..df134687d5 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -54,6 +54,7 @@ #include "bgpd/bgp_errors.h" #include "bgpd/bgp_fsm.h" #include "bgpd/bgp_nexthop.h" +#include "bgpd/bgp_network.h" #include "bgpd/bgp_open.h" #include "bgpd/bgp_regex.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) { 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); - 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, su->sin6.sin6_scope_id, bgp->vrf_id); + } - if (ifp) - return true; + if (ifp) { + 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; } |