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

zebra: Refactor kernel_rtm to be a bit smarter about how it handles options

Browse Source 
The ADD/DELETE messages are the only ones we support, so leave
early from the function, in other words don't check it every
nexthop loop.

Additionally nexthops only care about non recursive active flags.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-12-17 18:21:38 -05:00
parent 08ea27d112
commit 86afd5292f
1 changed files with 131 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

266
zebra/rt_socket.c
View File

@ -135,6 +135,19 @@ static int kernel_rtm(int cmd, const struct prefix *p,
if (IS_ZEBRA_DEBUG_RIB) if (IS_ZEBRA_DEBUG_RIB)
prefix2str(p, prefix_buf, sizeof(prefix_buf)); prefix2str(p, prefix_buf, sizeof(prefix_buf));
/*
* We only have the ability to ADD or DELETE at this point
* in time.
*/
if (cmd != RTM_ADD && cmd != RTM_DELETE) {
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug("%s: %s odd command %s for flags %d",
__func__, prefix_buf,
lookup_msg(rtm_type_str, cmd, NULL),
nexthop->flags);
return 0;
}
memset(&sin_dest, 0, sizeof(sin_dest)); memset(&sin_dest, 0, sizeof(sin_dest));
memset(&sin_gate, 0, sizeof(sin_gate)); memset(&sin_gate, 0, sizeof(sin_gate));
memset(&sin_mask, 0, sizeof(sin_mask)); memset(&sin_mask, 0, sizeof(sin_mask));
@ -164,32 +177,29 @@ static int kernel_rtm(int cmd, const struct prefix *p,
/* Make gateway. */ /* Make gateway. */
for (ALL_NEXTHOPS_PTR(ng, nexthop)) { for (ALL_NEXTHOPS_PTR(ng, nexthop)) {
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE)) /*
* We only want to use the actual good nexthops
*/
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE) ||
!CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
continue; continue;
gate = 0; gate = 0;
char gate_buf[INET_ADDRSTRLEN] = "NULL"; char gate_buf[INET_ADDRSTRLEN] = "NULL";
/* switch (nexthop->type) {
* XXX We need to refrain from kernel operations in some cases, case NEXTHOP_TYPE_IPV4:
* but this if statement seems overly cautious - what about case NEXTHOP_TYPE_IPV4_IFINDEX:
* other than ADD and DELETE? sin_gate.sin.sin_addr = nexthop->gate.ipv4;
*/ sin_gate.sin.sin_family = AF_INET;
if ((cmd == RTM_ADD && NEXTHOP_IS_ACTIVE(nexthop->flags)) ifindex = nexthop->ifindex;
|| (cmd == RTM_DELETE)) { gate = 1;
switch (nexthop->type) { break;
case NEXTHOP_TYPE_IPV4: case NEXTHOP_TYPE_IPV6:
case NEXTHOP_TYPE_IPV4_IFINDEX: case NEXTHOP_TYPE_IPV6_IFINDEX:
sin_gate.sin.sin_addr = nexthop->gate.ipv4; sin_gate.sin6.sin6_addr = nexthop->gate.ipv6;
sin_gate.sin.sin_family = AF_INET; sin_gate.sin6.sin6_family = AF_INET6;
ifindex = nexthop->ifindex; ifindex = nexthop->ifindex;
gate = 1;
break;
case NEXTHOP_TYPE_IPV6:
case NEXTHOP_TYPE_IPV6_IFINDEX:
sin_gate.sin6.sin6_addr = nexthop->gate.ipv6;
sin_gate.sin6.sin6_family = AF_INET6;
ifindex = nexthop->ifindex;
/* Under kame set interface index to link local address */ /* Under kame set interface index to link local address */
#ifdef KAME #ifdef KAME
@ -199,132 +209,118 @@ static int kernel_rtm(int cmd, const struct prefix *p,
(a).s6_addr[3] = (i)&0xff; \ (a).s6_addr[3] = (i)&0xff; \
} while (0) } while (0)
if (IN6_IS_ADDR_LINKLOCAL( if (IN6_IS_ADDR_LINKLOCAL(&sin_gate.sin6.sin6_addr))
&sin_gate.sin6.sin6_addr)) SET_IN6_LINKLOCAL_IFINDEX(
SET_IN6_LINKLOCAL_IFINDEX( sin_gate.sin6.sin6_addr,
sin_gate.sin6.sin6_addr, ifindex);
ifindex);
#endif /* KAME */ #endif /* KAME */
gate = 1; gate = 1;
break; break;
case NEXTHOP_TYPE_IFINDEX: case NEXTHOP_TYPE_IFINDEX:
ifindex = nexthop->ifindex; ifindex = nexthop->ifindex;
break; break;
case NEXTHOP_TYPE_BLACKHOLE: case NEXTHOP_TYPE_BLACKHOLE:
bh_type = nexthop->bh_type; bh_type = nexthop->bh_type;
switch (p->family) {
case AFI_IP: {
struct in_addr loopback;
loopback.s_addr =
htonl(INADDR_LOOPBACK);
sin_gate.sin.sin_addr = loopback;
gate = 1;
}
break;
case AFI_IP6:
break;
}
}
switch (p->family) { switch (p->family) {
case AF_INET: case AFI_IP: {
if (gate && p->prefixlen == 32) struct in_addr loopback;
mask = NULL; loopback.s_addr = htonl(INADDR_LOOPBACK);
else { sin_gate.sin.sin_addr = loopback;
masklen2ip(p->prefixlen, gate = 1;
&sin_mask.sin.sin_addr); }
sin_mask.sin.sin_family = AF_INET;
#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
sin_mask.sin.sin_len = sin_masklen(
sin_mask.sin.sin_addr);
#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
mask = &sin_mask;
}
break; break;
case AF_INET6: case AFI_IP6:
if (gate && p->prefixlen == 128)
mask = NULL;
else {
masklen2ip6(p->prefixlen,
&sin_mask.sin6.sin6_addr);
sin_mask.sin6.sin6_family = AF_INET6;
#ifdef SIN6_LEN
sin_mask.sin6.sin6_len = sin6_masklen(
sin_mask.sin6.sin6_addr);
#endif /* SIN6_LEN */
mask = &sin_mask;
}
break; break;
} }
}
switch (p->family) {
case AF_INET:
if (gate && p->prefixlen == 32)
mask = NULL;
else {
masklen2ip(p->prefixlen,
&sin_mask.sin.sin_addr);
sin_mask.sin.sin_family = AF_INET;
#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
sin_mask.sin.sin_len = sin_masklen(
sin_mask.sin.sin_addr);
#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
mask = &sin_mask;
}
break;
case AF_INET6:
if (gate && p->prefixlen == 128)
mask = NULL;
else {
masklen2ip6(p->prefixlen,
&sin_mask.sin6.sin6_addr);
sin_mask.sin6.sin6_family = AF_INET6;
#ifdef SIN6_LEN
sin_mask.sin6.sin6_len = sin6_masklen(
sin_mask.sin6.sin6_addr);
#endif /* SIN6_LEN */
mask = &sin_mask;
}
break;
}
#ifdef __OpenBSD__ #ifdef __OpenBSD__
if (nexthop->nh_label if (nexthop->nh_label
&& !kernel_rtm_add_labels(nexthop->nh_label, && !kernel_rtm_add_labels(nexthop->nh_label, &smpls))
&smpls)) continue;
continue; smplsp = (union sockunion *)&smpls;
smplsp = (union sockunion *)&smpls;
#endif #endif
error = rtm_write(cmd, &sin_dest, mask, error = rtm_write(cmd, &sin_dest, mask,
gate ? &sin_gate : NULL, smplsp, gate ? &sin_gate : NULL, smplsp,
ifindex, bh_type, metric); ifindex, bh_type, metric);
if (IS_ZEBRA_DEBUG_KERNEL) { if (IS_ZEBRA_DEBUG_KERNEL) {
if (!gate) { if (!gate) {
zlog_debug( zlog_debug("%s: %s: attention! gate not found for re",
"%s: %s: attention! gate not found for re", __func__, prefix_buf);
__func__, prefix_buf); } else
} else inet_ntop(p->family == AFI_IP ? AF_INET
inet_ntop(p->family == AFI_IP ? AF_INET : AF_INET6,
: AF_INET6, &sin_gate.sin.sin_addr,
&sin_gate.sin.sin_addr, gate_buf, INET_ADDRSTRLEN);
gate_buf, INET_ADDRSTRLEN); }
} switch (error) {
switch (error) { /* We only flag nexthops as being in FIB if
/* We only flag nexthops as being in FIB if * rtm_write() did its work. */
* rtm_write() did its work. */ case ZEBRA_ERR_NOERROR:
case ZEBRA_ERR_NOERROR: nexthop_num++;
nexthop_num++; if (IS_ZEBRA_DEBUG_KERNEL)
if (IS_ZEBRA_DEBUG_KERNEL) zlog_debug("%s: %s: successfully did NH %s",
zlog_debug( __func__, prefix_buf, gate_buf);
"%s: %s: successfully did NH %s", if (cmd == RTM_ADD)
__func__, prefix_buf, gate_buf); SET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
if (cmd == RTM_ADD) break;
SET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
break;
/* The only valid case for this error is /* The only valid case for this error is
* kernel's failure to install a multipath * kernel's failure to install a multipath
* route, which is common for FreeBSD. This * route, which is common for FreeBSD. This
* should be * should be ignored silently, but logged as an error
* ignored silently, but logged as an error * otherwise.
* otherwise. */
*/ case ZEBRA_ERR_RTEXIST:
case ZEBRA_ERR_RTEXIST: if (cmd != RTM_ADD)
if (cmd != RTM_ADD) flog_err(EC_LIB_SYSTEM_CALL,
flog_err( "%s: rtm_write() returned %d for command %d",
EC_LIB_SYSTEM_CALL, __func__, error, cmd);
"%s: rtm_write() returned %d for command %d", continue;
__func__, error, cmd);
continue;
/* Note any unexpected status returns */ /* Note any unexpected status returns */
default: default:
flog_err( flog_err(EC_LIB_SYSTEM_CALL,
EC_LIB_SYSTEM_CALL, "%s: %s: rtm_write() unexpectedly returned %d for command %s",
"%s: %s: rtm_write() unexpectedly returned %d for command %s", __func__,
__func__, prefix2str(p, prefix_buf,
prefix2str(p, prefix_buf, sizeof(prefix_buf)),
sizeof(prefix_buf)), error, lookup_msg(rtm_type_str, cmd, NULL));
error, break;
lookup_msg(rtm_type_str, cmd, NULL)); }
break;
}
} /* if (cmd and flags make sense) */
else if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug("%s: odd command %s for flags %d", __func__,
lookup_msg(rtm_type_str, cmd, NULL),
nexthop->flags);
} /* for (ALL_NEXTHOPS(...))*/ } /* for (ALL_NEXTHOPS(...))*/
/* If there was no useful nexthop, then complain. */ /* If there was no useful nexthop, then complain. */