}
#endif
+#ifdef SIN6_LEN
+/* Calculate sin6_len value for netmask socket value. */
+static int sin6_masklen(struct in6_addr mask)
+{
+ struct sockaddr_in6 sin6;
+ char *p, *lim;
+ int len;
+
+ if (IN6_IS_ADDR_UNSPECIFIED(&mask))
+ return sizeof(long);
+
+ sin6.sin6_addr = mask;
+ len = sizeof(struct sockaddr_in6);
+
+ lim = (char *)&sin6.sin6_addr;
+ p = lim + sizeof(sin6.sin6_addr);
+
+ while (*--p == 0 && p >= lim)
+ len--;
+
+ return len;
+}
+#endif /* SIN6_LEN */
+
/* Interface between zebra message and rtm message. */
static int kernel_rtm_ipv4(int cmd, const struct prefix *p,
- struct route_entry *re)
+ const struct nexthop_group *ng, uint32_t metric)
{
- struct sockaddr_in *mask = NULL;
- struct sockaddr_in sin_dest, sin_mask, sin_gate;
+ union sockunion *mask = NULL;
+ union sockunion sin_dest, sin_mask, sin_gate;
#ifdef __OpenBSD__
struct sockaddr_mpls smpls;
#endif
if (IS_ZEBRA_DEBUG_RIB)
prefix2str(p, prefix_buf, sizeof(prefix_buf));
- memset(&sin_dest, 0, sizeof(struct sockaddr_in));
- sin_dest.sin_family = AF_INET;
+ memset(&sin_dest, 0, sizeof(sin_dest));
+ sin_dest.sin.sin_family = AF_INET;
#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
- sin_dest.sin_len = sizeof(struct sockaddr_in);
+ sin_dest.sin.sin_len = sizeof(sin_dest);
#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
- sin_dest.sin_addr = p->u.prefix4;
+ sin_dest.sin.sin_addr = p->u.prefix4;
- memset(&sin_mask, 0, sizeof(struct sockaddr_in));
+ memset(&sin_mask, 0, sizeof(sin_mask));
- memset(&sin_gate, 0, sizeof(struct sockaddr_in));
- sin_gate.sin_family = AF_INET;
+ memset(&sin_gate, 0, sizeof(sin_gate));
+ sin_gate.sin.sin_family = AF_INET;
#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
- sin_gate.sin_len = sizeof(struct sockaddr_in);
+ sin_gate.sin.sin_len = sizeof(sin_gate);
#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
/* Make gateway. */
- for (ALL_NEXTHOPS(re->ng, nexthop)) {
+ for (ALL_NEXTHOPS_PTR(ng, nexthop)) {
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE))
continue;
* other than ADD and DELETE?
*/
if ((cmd == RTM_ADD && NEXTHOP_IS_ACTIVE(nexthop->flags))
- || (cmd == RTM_DELETE
- && CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB))) {
+ || (cmd == RTM_DELETE)) {
if (nexthop->type == NEXTHOP_TYPE_IPV4
|| nexthop->type == NEXTHOP_TYPE_IPV4_IFINDEX) {
- sin_gate.sin_addr = nexthop->gate.ipv4;
+ sin_gate.sin.sin_addr = nexthop->gate.ipv4;
gate = 1;
}
if (nexthop->type == NEXTHOP_TYPE_IFINDEX
if (nexthop->type == NEXTHOP_TYPE_BLACKHOLE) {
struct in_addr loopback;
loopback.s_addr = htonl(INADDR_LOOPBACK);
- sin_gate.sin_addr = loopback;
+ sin_gate.sin.sin_addr = loopback;
bh_type = nexthop->bh_type;
gate = 1;
}
if (gate && p->prefixlen == 32)
mask = NULL;
else {
- masklen2ip(p->prefixlen, &sin_mask.sin_addr);
- sin_mask.sin_family = AF_INET;
+ 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_len =
- sin_masklen(sin_mask.sin_addr);
+ sin_mask.sin.sin_len =
+ sin_masklen(sin_mask.sin.sin_addr);
#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
mask = &sin_mask;
}
smplsp = (union sockunion *)&smpls;
#endif
- error = rtm_write(cmd, (union sockunion *)&sin_dest,
- (union sockunion *)mask,
- gate ? (union sockunion *)&sin_gate
- : NULL,
- smplsp, ifindex, bh_type, re->metric);
+ error = rtm_write(cmd, &sin_dest, mask,
+ gate ? &sin_gate : NULL, smplsp,
+ ifindex, bh_type, metric);
- if (IS_ZEBRA_DEBUG_RIB) {
+ if (IS_ZEBRA_DEBUG_KERNEL) {
if (!gate) {
zlog_debug(
- "%s: %s: attention! gate not found for re %p",
- __func__, prefix_buf, re);
- route_entry_dump(p, NULL, re);
+ "%s: %s: attention! gate not found for re",
+ __func__, prefix_buf);
} else
- inet_ntop(AF_INET, &sin_gate.sin_addr,
+ inet_ntop(AF_INET,
+ &sin_gate.sin.sin_addr,
gate_buf, INET_ADDRSTRLEN);
}
* did its work. */
case ZEBRA_ERR_NOERROR:
nexthop_num++;
- if (IS_ZEBRA_DEBUG_RIB)
+ if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(
"%s: %s: successfully did NH %s",
__func__, prefix_buf, gate_buf);
+
+ if (cmd == RTM_ADD)
+ SET_FLAG(nexthop->flags,
+ NEXTHOP_FLAG_FIB);
+
break;
/* The only valid case for this error is kernel's
case ZEBRA_ERR_RTEXIST:
if (cmd != RTM_ADD)
flog_err(
- LIB_ERR_SYSTEM_CALL,
+ EC_LIB_SYSTEM_CALL,
"%s: rtm_write() returned %d for command %d",
__func__, error, cmd);
continue;
- break;
- /* Given that our NEXTHOP_FLAG_FIB matches real kernel
- * FIB, it isn't
- * normal to get any other messages in ANY case.
- */
- case ZEBRA_ERR_RTNOEXIST:
- case ZEBRA_ERR_RTUNREACH:
+ /* Note any unexpected status returns */
default:
flog_err(
- LIB_ERR_SYSTEM_CALL,
+ EC_LIB_SYSTEM_CALL,
"%s: %s: rtm_write() unexpectedly returned %d for command %s",
__func__,
prefix2str(p, prefix_buf,
break;
}
} /* if (cmd and flags make sense) */
- else if (IS_ZEBRA_DEBUG_RIB)
+ 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(...))*/
/* If there was no useful nexthop, then complain. */
- if (nexthop_num == 0 && IS_ZEBRA_DEBUG_KERNEL)
- zlog_debug("%s: No useful nexthops were found in RIB entry %p",
- __func__, re);
+ if (nexthop_num == 0) {
+ if (IS_ZEBRA_DEBUG_KERNEL)
+ zlog_debug("%s: No useful nexthops were found in RIB prefix %s",
+ __func__, prefix2str(p, prefix_buf,
+ sizeof(prefix_buf)));
+ return 1;
+ }
return 0; /*XXX*/
}
-#ifdef SIN6_LEN
-/* Calculate sin6_len value for netmask socket value. */
-static int sin6_masklen(struct in6_addr mask)
-{
- struct sockaddr_in6 sin6;
- char *p, *lim;
- int len;
-
- if (IN6_IS_ADDR_UNSPECIFIED(&mask))
- return sizeof(long);
-
- sin6.sin6_addr = mask;
- len = sizeof(struct sockaddr_in6);
-
- lim = (char *)&sin6.sin6_addr;
- p = lim + sizeof(sin6.sin6_addr);
-
- while (*--p == 0 && p >= lim)
- len--;
-
- return len;
-}
-#endif /* SIN6_LEN */
-
/* Interface between zebra message and rtm message. */
static int kernel_rtm_ipv6(int cmd, const struct prefix *p,
- struct route_entry *re)
+ const struct nexthop_group *ng, uint32_t metric)
{
- struct sockaddr_in6 *mask;
- struct sockaddr_in6 sin_dest, sin_mask, sin_gate;
+ union sockunion *mask;
+ union sockunion sin_dest, sin_mask, sin_gate;
#ifdef __OpenBSD__
struct sockaddr_mpls smpls;
#endif
int error;
enum blackhole_type bh_type = BLACKHOLE_UNSPEC;
- memset(&sin_dest, 0, sizeof(struct sockaddr_in6));
- sin_dest.sin6_family = AF_INET6;
+ memset(&sin_dest, 0, sizeof(sin_dest));
+ sin_dest.sin6.sin6_family = AF_INET6;
#ifdef SIN6_LEN
- sin_dest.sin6_len = sizeof(struct sockaddr_in6);
+ sin_dest.sin6.sin6_len = sizeof(sin_dest);
#endif /* SIN6_LEN */
- sin_dest.sin6_addr = p->u.prefix6;
+ sin_dest.sin6.sin6_addr = p->u.prefix6;
- memset(&sin_mask, 0, sizeof(struct sockaddr_in6));
+ memset(&sin_mask, 0, sizeof(sin_mask));
- memset(&sin_gate, 0, sizeof(struct sockaddr_in6));
- sin_gate.sin6_family = AF_INET6;
+ memset(&sin_gate, 0, sizeof(sin_gate));
+ sin_gate.sin6.sin6_family = AF_INET6;
#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
- sin_gate.sin6_len = sizeof(struct sockaddr_in6);
+ sin_gate.sin6.sin6_len = sizeof(sin_gate);
#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
/* Make gateway. */
- for (ALL_NEXTHOPS(re->ng, nexthop)) {
+ for (ALL_NEXTHOPS_PTR(ng, nexthop)) {
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE))
continue;
|| (cmd == RTM_DELETE)) {
if (nexthop->type == NEXTHOP_TYPE_IPV6
|| nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX) {
- sin_gate.sin6_addr = nexthop->gate.ipv6;
+ sin_gate.sin6.sin6_addr = nexthop->gate.ipv6;
gate = 1;
}
if (nexthop->type == NEXTHOP_TYPE_IFINDEX
(a).s6_addr[3] = (i)&0xff; \
} while (0)
- if (gate && IN6_IS_ADDR_LINKLOCAL(&sin_gate.sin6_addr))
- SET_IN6_LINKLOCAL_IFINDEX(sin_gate.sin6_addr, ifindex);
+ if (gate && IN6_IS_ADDR_LINKLOCAL(&sin_gate.sin6.sin6_addr))
+ SET_IN6_LINKLOCAL_IFINDEX(sin_gate.sin6.sin6_addr,
+ ifindex);
#endif /* KAME */
if (gate && p->prefixlen == 128)
mask = NULL;
else {
- masklen2ip6(p->prefixlen, &sin_mask.sin6_addr);
- sin_mask.sin6_family = AF_INET6;
+ masklen2ip6(p->prefixlen, &sin_mask.sin6.sin6_addr);
+ sin_mask.sin6.sin6_family = AF_INET6;
#ifdef SIN6_LEN
- sin_mask.sin6_len = sin6_masklen(sin_mask.sin6_addr);
+ sin_mask.sin6.sin6_len =
+ sin6_masklen(sin_mask.sin6.sin6_addr);
#endif /* SIN6_LEN */
mask = &sin_mask;
}
smplsp = (union sockunion *)&smpls;
#endif
- error = rtm_write(cmd, (union sockunion *)&sin_dest,
- (union sockunion *)mask,
- gate ? (union sockunion *)&sin_gate : NULL,
- smplsp, ifindex, bh_type, re->metric);
- (void)error;
+ error = rtm_write(cmd, &sin_dest, mask, gate ? &sin_gate : NULL,
+ smplsp, ifindex, bh_type, metric);
+
+ /* Update installed nexthop info on success */
+ if ((cmd == RTM_ADD) && (error == ZEBRA_ERR_NOERROR))
+ SET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
nexthop_num++;
}
if (nexthop_num == 0) {
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug("kernel_rtm_ipv6(): No useful nexthop.");
- return 0;
+ return 1;
}
return 0; /*XXX*/
}
-static int kernel_rtm(int cmd, const struct prefix *p, struct route_entry *re)
+static int kernel_rtm(int cmd, const struct prefix *p,
+ const struct nexthop_group *ng, uint32_t metric)
{
switch (PREFIX_FAMILY(p)) {
case AF_INET:
- return kernel_rtm_ipv4(cmd, p, re);
+ return kernel_rtm_ipv4(cmd, p, ng, metric);
case AF_INET6:
- return kernel_rtm_ipv6(cmd, p, re);
+ return kernel_rtm_ipv6(cmd, p, ng, metric);
}
return 0;
}
-enum dp_req_result kernel_route_rib(struct route_node *rn,
- const struct prefix *p,
- const struct prefix *src_p,
- struct route_entry *old,
- struct route_entry *new)
+/*
+ * Update or delete a prefix from the kernel,
+ * using info from a dataplane context struct.
+ */
+enum zebra_dplane_result kernel_route_update(struct zebra_dplane_ctx *ctx)
{
- int route = 0;
+ enum zebra_dplane_result res = ZEBRA_DPLANE_REQUEST_SUCCESS;
- if (src_p && src_p->prefixlen) {
- flog_warn(EC_ZEBRA_UNSUPPORTED_V6_SRCDEST,
- "%s: IPv6 sourcedest routes unsupported!", __func__);
- return DP_REQUEST_FAILURE;
+ if (dplane_ctx_get_src(ctx) != NULL) {
+ zlog_err("route add: IPv6 sourcedest routes unsupported!");
+ res = ZEBRA_DPLANE_REQUEST_FAILURE;
+ goto done;
}
frr_elevate_privs(&zserv_privs) {
- if (old)
- route |= kernel_rtm(RTM_DELETE, p, old);
-
- if (new)
- route |= kernel_rtm(RTM_ADD, p, new);
-
- }
+ if (dplane_ctx_get_op(ctx) == DPLANE_OP_ROUTE_DELETE)
+ kernel_rtm(RTM_DELETE, dplane_ctx_get_dest(ctx),
+ dplane_ctx_get_ng(ctx),
+ dplane_ctx_get_metric(ctx));
+ else if (dplane_ctx_get_op(ctx) == DPLANE_OP_ROUTE_INSTALL)
+ kernel_rtm(RTM_ADD, dplane_ctx_get_dest(ctx),
+ dplane_ctx_get_ng(ctx),
+ dplane_ctx_get_metric(ctx));
+ else if (dplane_ctx_get_op(ctx) == DPLANE_OP_ROUTE_UPDATE) {
+ /* Must do delete and add separately -
+ * no update available
+ */
+ kernel_rtm(RTM_DELETE, dplane_ctx_get_dest(ctx),
+ dplane_ctx_get_old_ng(ctx),
+ dplane_ctx_get_old_metric(ctx));
+
+ kernel_rtm(RTM_ADD, dplane_ctx_get_dest(ctx),
+ dplane_ctx_get_ng(ctx),
+ dplane_ctx_get_metric(ctx));
+ } else {
+ zlog_err("Invalid routing socket update op %s (%u)",
+ dplane_op2str(dplane_ctx_get_op(ctx)),
+ dplane_ctx_get_op(ctx));
+ res = ZEBRA_DPLANE_REQUEST_FAILURE;
+ }
+ } /* Elevated privs */
- if (new) {
- kernel_route_rib_pass_fail(
- rn, p, new,
- (!route) ? DP_INSTALL_SUCCESS
- : DP_INSTALL_FAILURE);
- } else {
- kernel_route_rib_pass_fail(rn, p, old,
- (!route)
- ? DP_DELETE_SUCCESS
- : DP_DELETE_FAILURE);
- }
+done:
- return DP_REQUEST_SUCCESS;
+ return res;
}
int kernel_neigh_update(int add, int ifindex, uint32_t addr, char *lla,
}
int kernel_add_mac(struct interface *ifp, vlanid_t vid, struct ethaddr *mac,
- struct in_addr vtep_ip, uint8_t sticky)
+ struct in_addr vtep_ip, bool sticky)
{
return 0;
}
int kernel_del_mac(struct interface *ifp, vlanid_t vid, struct ethaddr *mac,
- struct in_addr vtep_ip, int local)
+ struct in_addr vtep_ip)
{
return 0;
}
projects / mirror_frr.git / blobdiff