proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-25 22:00:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6138 from donaldsharp/rtadv_respect_the_vrf

Browse Source 
Rtadv respect the vrf
This commit is contained in:
David Lamparter 2020-04-03 14:04:43 +02:00 committed by GitHub
commit 51c5566a07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 111 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zebra/main.c
View File

@ -174,6 +174,7 @@ static void sigint(void)
work_queue_free_and_null(&zrouter.lsp_process_q); work_queue_free_and_null(&zrouter.lsp_process_q);
vrf_terminate(); vrf_terminate();
rtadv_terminate();
ns_walk_func(zebra_ns_early_shutdown); ns_walk_func(zebra_ns_early_shutdown);
zebra_ns_notify_close(); zebra_ns_notify_close();

161
zebra/rtadv.c
View File

@ -204,9 +204,12 @@ static void rtadv_send_packet(int sock, struct interface *ifp,
} }
/* Logging of packet. */ /* Logging of packet. */
if (IS_ZEBRA_DEBUG_PACKET) if (IS_ZEBRA_DEBUG_PACKET) {
zlog_debug("%s(%u): Tx RA, socket %u", ifp->name, ifp->ifindex, struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
sock);
zlog_debug("%s(%s:%u): Tx RA, socket %u", ifp->name,
VRF_LOGNAME(vrf), ifp->ifindex, sock);
}
/* Fill in sockaddr_in6. */ /* Fill in sockaddr_in6. */
memset(&addr, 0, sizeof(struct sockaddr_in6)); memset(&addr, 0, sizeof(struct sockaddr_in6));
@ -333,16 +336,6 @@ static void rtadv_send_packet(int sock, struct interface *ifp,
IPV6_ADDR_COPY(&pinfo->nd_opt_pi_prefix, IPV6_ADDR_COPY(&pinfo->nd_opt_pi_prefix,
&rprefix->prefix.prefix); &rprefix->prefix.prefix);
#ifdef DEBUG
{
uint8_t buf[INET6_ADDRSTRLEN];
zlog_debug("DEBUG %s",
inet_ntop(AF_INET6, &pinfo->nd_opt_pi_prefix,
buf, INET6_ADDRSTRLEN));
}
#endif /* DEBUG */
len += sizeof(struct nd_opt_prefix_info); len += sizeof(struct nd_opt_prefix_info);
} }
@ -388,9 +381,11 @@ static void rtadv_send_packet(int sock, struct interface *ifp,
sizeof(struct nd_opt_rdnss) + sizeof(struct in6_addr); sizeof(struct nd_opt_rdnss) + sizeof(struct in6_addr);
if (len + opt_len > max_len) { if (len + opt_len > max_len) {
struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
zlog_warn( zlog_warn(
"%s(%u): Tx RA: RDNSS option would exceed MTU, omitting it", "%s(%s:%u): Tx RA: RDNSS option would exceed MTU, omitting it",
ifp->name, ifp->ifindex); ifp->name, VRF_LOGNAME(vrf), ifp->ifindex);
goto no_more_opts; goto no_more_opts;
} }
struct nd_opt_rdnss *opt = (struct nd_opt_rdnss *)(buf + len); struct nd_opt_rdnss *opt = (struct nd_opt_rdnss *)(buf + len);
@ -510,10 +505,17 @@ static int rtadv_timer(struct thread *thread)
<= 0) <= 0)
zif->rtadv.inFastRexmit = 0; zif->rtadv.inFastRexmit = 0;
if (IS_ZEBRA_DEBUG_SEND) if (IS_ZEBRA_DEBUG_SEND) {
struct vrf *vrf =
vrf_lookup_by_id(
ifp->vrf_id);
zlog_debug( zlog_debug(
"Fast RA Rexmit on interface %s", "Fast RA Rexmit on interface %s(%s:%u)",
ifp->name); ifp->name,
VRF_LOGNAME(vrf),
ifp->ifindex);
}
rtadv_send_packet(rtadv_get_socket(zvrf), rtadv_send_packet(rtadv_get_socket(zvrf),
ifp, RA_ENABLE); ifp, RA_ENABLE);
@ -612,9 +614,14 @@ static void rtadv_process_advert(uint8_t *msg, unsigned int len,
inet_ntop(AF_INET6, &addr->sin6_addr, addr_str, INET6_ADDRSTRLEN); inet_ntop(AF_INET6, &addr->sin6_addr, addr_str, INET6_ADDRSTRLEN);
if (len < sizeof(struct nd_router_advert)) { if (len < sizeof(struct nd_router_advert)) {
if (IS_ZEBRA_DEBUG_PACKET) if (IS_ZEBRA_DEBUG_PACKET) {
zlog_debug("%s(%u): Rx RA with invalid length %d from %s", struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
ifp->name, ifp->ifindex, len, addr_str);
zlog_debug(
"%s(%s:%u): Rx RA with invalid length %d from %s",
ifp->name, VRF_LOGNAME(vrf), ifp->ifindex, len,
addr_str);
}
return; return;
} }
@ -622,9 +629,14 @@ static void rtadv_process_advert(uint8_t *msg, unsigned int len,
rtadv_process_optional(msg + sizeof(struct nd_router_advert), rtadv_process_optional(msg + sizeof(struct nd_router_advert),
len - sizeof(struct nd_router_advert), len - sizeof(struct nd_router_advert),
ifp, addr); ifp, addr);
if (IS_ZEBRA_DEBUG_PACKET) if (IS_ZEBRA_DEBUG_PACKET) {
zlog_debug("%s(%u): Rx RA with non-linklocal source address from %s", struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
ifp->name, ifp->ifindex, addr_str);
zlog_debug(
"%s(%s:%u): Rx RA with non-linklocal source address from %s",
ifp->name, VRF_LOGNAME(vrf), ifp->ifindex,
addr_str);
}
return; return;
} }
@ -703,9 +715,12 @@ static void rtadv_process_packet(uint8_t *buf, unsigned int len,
return; return;
} }
if (IS_ZEBRA_DEBUG_PACKET) if (IS_ZEBRA_DEBUG_PACKET) {
zlog_debug("%s(%u): Rx RA/RS len %d from %s", ifp->name, struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
ifp->ifindex, len, addr_str);
zlog_debug("%s(%s:%u): Rx RA/RS len %d from %s", ifp->name,
VRF_LOGNAME(vrf), ifp->ifindex, len, addr_str);
}
if (if_is_loopback(ifp) if (if_is_loopback(ifp)
|| CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK)) || CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK))
@ -718,8 +733,11 @@ static void rtadv_process_packet(uint8_t *buf, unsigned int len,
/* ICMP message length check. */ /* ICMP message length check. */
if (len < sizeof(struct icmp6_hdr)) { if (len < sizeof(struct icmp6_hdr)) {
zlog_debug("%s(%u): Rx RA with Invalid ICMPV6 packet length %d", struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
ifp->name, ifp->ifindex, len);
zlog_debug(
"%s(%s:%u): Rx RA with Invalid ICMPV6 packet length %d",
ifp->name, VRF_LOGNAME(vrf), ifp->ifindex, len);
return; return;
} }
@ -728,15 +746,20 @@ static void rtadv_process_packet(uint8_t *buf, unsigned int len,
/* ICMP message type check. */ /* ICMP message type check. */
if (icmph->icmp6_type != ND_ROUTER_SOLICIT if (icmph->icmp6_type != ND_ROUTER_SOLICIT
&& icmph->icmp6_type != ND_ROUTER_ADVERT) { && icmph->icmp6_type != ND_ROUTER_ADVERT) {
zlog_debug("%s(%u): Rx RA - Unwanted ICMPV6 message type %d", struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
ifp->name, ifp->ifindex, icmph->icmp6_type);
zlog_debug("%s(%s:%u): Rx RA - Unwanted ICMPV6 message type %d",
ifp->name, VRF_LOGNAME(vrf), ifp->ifindex,
icmph->icmp6_type);
return; return;
} }
/* Hoplimit check. */ /* Hoplimit check. */
if (hoplimit >= 0 && hoplimit != 255) { if (hoplimit >= 0 && hoplimit != 255) {
zlog_debug("%s(%u): Rx RA - Invalid hoplimit %d", ifp->name, struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
ifp->ifindex, hoplimit);
zlog_debug("%s(%s:%u): Rx RA - Invalid hoplimit %d", ifp->name,
VRF_LOGNAME(vrf), ifp->ifindex, hoplimit);
return; return;
} }
@ -1055,25 +1078,34 @@ static void zebra_interface_radv_set(ZAPI_HANDLER_ARGS, int enable)
unsigned int ra_interval = ra_interval_rxd; unsigned int ra_interval = ra_interval_rxd;
if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_EVENT) {
zlog_debug("%u: IF %u RA %s from client %s, interval %ums", struct vrf *vrf = zvrf->vrf;
zvrf_id(zvrf), ifindex,
zlog_debug("%s:%u: IF %u RA %s from client %s, interval %ums",
VRF_LOGNAME(vrf), zvrf_id(zvrf), ifindex,
enable ? "enable" : "disable", enable ? "enable" : "disable",
zebra_route_string(client->proto), ra_interval); zebra_route_string(client->proto), ra_interval);
}
/* Locate interface and check VRF match. */ /* Locate interface and check VRF match. */
ifp = if_lookup_by_index(ifindex, zvrf->vrf->vrf_id); ifp = if_lookup_by_index(ifindex, zvrf->vrf->vrf_id);
if (!ifp) { if (!ifp) {
struct vrf *vrf = zvrf->vrf;
flog_warn(EC_ZEBRA_UNKNOWN_INTERFACE, flog_warn(EC_ZEBRA_UNKNOWN_INTERFACE,
"%u: IF %u RA %s client %s - interface unknown", "%s:%u: IF %u RA %s client %s - interface unknown",
zvrf_id(zvrf), ifindex, enable ? "enable" : "disable", VRF_LOGNAME(vrf), zvrf_id(zvrf), ifindex,
enable ? "enable" : "disable",
zebra_route_string(client->proto)); zebra_route_string(client->proto));
return; return;
} }
if (ifp->vrf_id != zvrf_id(zvrf)) { if (ifp->vrf_id != zvrf_id(zvrf)) {
struct vrf *vrf = zvrf->vrf;
zlog_debug( zlog_debug(
"%u: IF %u RA %s client %s - VRF mismatch, IF VRF %u", "%s:%u: IF %u RA %s client %s - VRF mismatch, IF VRF %u",
zvrf_id(zvrf), ifindex, enable ? "enable" : "disable", VRF_LOGNAME(vrf), zvrf_id(zvrf), ifindex,
enable ? "enable" : "disable",
zebra_route_string(client->proto), ifp->vrf_id); zebra_route_string(client->proto), ifp->vrf_id);
return; return;
} }
@ -2329,6 +2361,13 @@ static void rtadv_event(struct zebra_vrf *zvrf, enum rtadv_event event, int val)
{ {
struct rtadv *rtadv = &zvrf->rtadv; struct rtadv *rtadv = &zvrf->rtadv;
if (IS_ZEBRA_DEBUG_EVENT) {
struct vrf *vrf = zvrf->vrf;
zlog_debug("%s(%s) with event: %d and val: %d", __func__,
VRF_LOGNAME(vrf), event, val);
}
switch (event) { switch (event) {
case RTADV_START: case RTADV_START:
thread_add_read(zrouter.master, rtadv_read, zvrf, val, thread_add_read(zrouter.master, rtadv_read, zvrf, val,
@ -2371,18 +2410,24 @@ void rtadv_init(struct zebra_vrf *zvrf)
} }
} }
void rtadv_terminate(struct zebra_vrf *zvrf) void rtadv_vrf_terminate(struct zebra_vrf *zvrf)
{ {
rtadv_event(zvrf, RTADV_STOP, 0); rtadv_event(zvrf, RTADV_STOP, 0);
if (zvrf->rtadv.sock >= 0) { if (zvrf->rtadv.sock >= 0) {
close(zvrf->rtadv.sock); close(zvrf->rtadv.sock);
zvrf->rtadv.sock = -1; zvrf->rtadv.sock = -1;
} else if (zrouter.rtadv_sock >= 0) { }
zvrf->rtadv.adv_if_count = 0;
zvrf->rtadv.adv_msec_if_count = 0;
}
void rtadv_terminate(void)
{
if (zrouter.rtadv_sock >= 0) {
close(zrouter.rtadv_sock); close(zrouter.rtadv_sock);
zrouter.rtadv_sock = -1; zrouter.rtadv_sock = -1;
} }
zvrf->rtadv.adv_if_count = 0;
zvrf->rtadv.adv_msec_if_count = 0;
} }
void rtadv_cmd_init(void) void rtadv_cmd_init(void)
@ -2445,10 +2490,13 @@ static int if_join_all_router(int sock, struct interface *ifp)
ifp->name, ifp->ifindex, sock, ifp->name, ifp->ifindex, sock,
safe_strerror(errno)); safe_strerror(errno));
if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_EVENT) {
struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
zlog_debug( zlog_debug(
"%s(%u): Join All-Routers multicast group, socket %u", "%s(%s:%u): Join All-Routers multicast group, socket %u",
ifp->name, ifp->ifindex, sock); ifp->name, VRF_LOGNAME(vrf), ifp->ifindex, sock);
}
return 0; return 0;
} }
@ -2465,17 +2513,22 @@ static int if_leave_all_router(int sock, struct interface *ifp)
ret = setsockopt(sock, IPPROTO_IPV6, IPV6_LEAVE_GROUP, (char *)&mreq, ret = setsockopt(sock, IPPROTO_IPV6, IPV6_LEAVE_GROUP, (char *)&mreq,
sizeof(mreq)); sizeof(mreq));
if (ret < 0) if (ret < 0) {
struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
flog_err_sys( flog_err_sys(
EC_LIB_SOCKET, EC_LIB_SOCKET,
"%s(%u): Failed to leave group, socket %u error %s", "%s(%s:%u): Failed to leave group, socket %u error %s",
ifp->name, ifp->ifindex, sock, safe_strerror(errno)); ifp->name, VRF_LOGNAME(vrf), ifp->ifindex, sock,
safe_strerror(errno));
}
if (IS_ZEBRA_DEBUG_EVENT) {
struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
if (IS_ZEBRA_DEBUG_EVENT)
zlog_debug( zlog_debug(
"%s(%u): Leave All-Routers multicast group, socket %u", "%s(%s:%u): Leave All-Routers multicast group, socket %u",
ifp->name, ifp->ifindex, sock); ifp->name, VRF_LOGNAME(vrf), ifp->ifindex, sock);
}
return 0; return 0;
} }

3
zebra/rtadv.h
View File

@ -153,7 +153,8 @@ typedef enum {
} ipv6_nd_suppress_ra_status; } ipv6_nd_suppress_ra_status;
extern void rtadv_init(struct zebra_vrf *zvrf); extern void rtadv_init(struct zebra_vrf *zvrf);
extern void rtadv_terminate(struct zebra_vrf *zvrf); extern void rtadv_vrf_terminate(struct zebra_vrf *zvrf);
extern void rtadv_terminate(void);
extern void rtadv_stop_ra(struct interface *ifp); extern void rtadv_stop_ra(struct interface *ifp);
extern void rtadv_stop_ra_all(void); extern void rtadv_stop_ra_all(void);
extern void rtadv_cmd_init(void); extern void rtadv_cmd_init(void);

2
zebra/zebra_vrf.c
View File

@ -178,7 +178,7 @@ static int zebra_vrf_disable(struct vrf *vrf)
zebra_vxlan_vrf_disable(zvrf); zebra_vxlan_vrf_disable(zvrf);
#if defined(HAVE_RTADV) #if defined(HAVE_RTADV)
rtadv_terminate(zvrf); rtadv_vrf_terminate(zvrf);
#endif #endif
/* Inform clients that the VRF is now inactive. This is a /* Inform clients that the VRF is now inactive. This is a