Page MenuHomeFreeBSD
Differential D30398 Diff 90724 sys/net/route/route_ctl.c

Changeset View

Standalone View

View Options

sys/net/route/route_ctl.c

Show First 20 Lines • Show All 100 Lines • ▼ Show 20 Lines
#else #else
#define _MP_FLAGS CTLFLAG_RD #define _MP_FLAGS CTLFLAG_RD
#endif #endif
VNET_DEFINE(u_int, rib_route_multipath) = 1; VNET_DEFINE(u_int, rib_route_multipath) = 1;
SYSCTL_UINT(_net_route, OID_AUTO, multipath, _MP_FLAGS | CTLFLAG_VNET, SYSCTL_UINT(_net_route, OID_AUTO, multipath, _MP_FLAGS | CTLFLAG_VNET,
&VNET_NAME(rib_route_multipath), 0, "Enable route multipath"); &VNET_NAME(rib_route_multipath), 0, "Enable route multipath");
#undef _MP_FLAGS #undef _MP_FLAGS
/*
#define V_rib_route_ipv4_nexthop VNET(rib_route_ipv4_nexthop)
zleiAuthorUnsubmitted
Done
Inline Actions

For the feature routing IPv6 packets via IPv4 next-hops, it does not require too much effort. If it is useful in some case, I think we can put it in a separate diff.
I'm not expert on this. I'll appreciate if someone would share the use-cases of routing IPv6 packets via IPv4 next-hops.

zlei: For the feature routing IPv6 packets via IPv4 next-hops, it does not require too much effort.
melifaroUnsubmitted
Done
Inline Actions

let's remove V6 over V4 for now.

melifaro: let's remove V6 over V4 for now.
VNET_DEFINE(u_int, rib_route_ipv4_nexthop) = 1;
SYSCTL_UINT(_net_route, OID_AUTO, ipv4_nexthop, CTLFLAG_RW | CTLFLAG_VNET,
&VNET_NAME(rib_route_ipv4_nexthop), 0, "Enable IPv6 route via IPv4 Next Hop address");
*/
#define V_rib_route_ipv6_nexthop VNET(rib_route_ipv6_nexthop)
VNET_DEFINE(u_int, rib_route_ipv6_nexthop) = 1;
SYSCTL_UINT(_net_route, OID_AUTO, ipv6_nexthop, CTLFLAG_RW | CTLFLAG_VNET,
&VNET_NAME(rib_route_ipv6_nexthop), 0, "Enable IPv4 route via IPv6 Next Hop address");
/* Routing table UMA zone */ /* Routing table UMA zone */
VNET_DEFINE_STATIC(uma_zone_t, rtzone); VNET_DEFINE_STATIC(uma_zone_t, rtzone);
melifaroUnsubmitted
Done
Inline Actions

Could you also add feature(3) knob here so the userland can check if the support for the functionality exists?

melifaro: Could you also add feature(3) knob here so the userland can check if the support for the…
zleiAuthorUnsubmitted
Done
Inline Actions

I'm new to this feature(3) knob. Can you guide me please ?

zlei: I'm new to this feature(3) knob. Can you guide me please ?
melifaroUnsubmitted
Done
Inline Actions

Something like FEATURE(ipv4_rfc5549_support, "Route IPv4 packets via IPv6 nexthops");
You can check sysctl kern.features for the features that currently exist.

melifaro: Something like `FEATURE(ipv4_rfc5549_support, "Route IPv4 packets via IPv6 nexthops");` You can…
#define V_rtzone VNET(rtzone) #define V_rtzone VNET(rtzone)
void void
vnet_rtzone_init() vnet_rtzone_init()
{ {
V_rtzone = uma_zcreate("rtentry", sizeof(struct rtentry), V_rtzone = uma_zcreate("rtentry", sizeof(struct rtentry),
NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
▲ Show 20 Lines • Show All 73 Lines • ▼ Show 20 Linesget_rnh(uint32_t fibnum, const struct rt_addrinfo *info)
KASSERT((fibnum < rt_numfibs), ("rib_add_route: bad fibnum")); KASSERT((fibnum < rt_numfibs), ("rib_add_route: bad fibnum"));
dst = info->rti_info[RTAX_DST]; dst = info->rti_info[RTAX_DST];
rnh = rt_tables_get_rnh(fibnum, dst->sa_family); rnh = rt_tables_get_rnh(fibnum, dst->sa_family);
return (rnh); return (rnh);
} }
/*
static bool
rib_can_ipv4_nexthop_address(struct rib_head *rh)
{
int result;
CURVNET_SET(rh->rib_vnet);
result = !!V_rib_route_ipv4_nexthop;
CURVNET_RESTORE();
return (result);
}
*/
static bool
rib_can_ipv6_nexthop_address(struct rib_head *rh)
{
int result;
CURVNET_SET(rh->rib_vnet);
result = !!V_rib_route_ipv6_nexthop;
CURVNET_RESTORE();
return (result);
}
#ifdef ROUTE_MPATH #ifdef ROUTE_MPATH
static bool static bool
rib_can_multipath(struct rib_head *rh) rib_can_multipath(struct rib_head *rh)
{ {
int result; int result;
CURVNET_SET(rh->rib_vnet); CURVNET_SET(rh->rib_vnet);
result = !!V_rib_route_multipath; result = !!V_rib_route_multipath;
▲ Show 20 Lines • Show All 360 Lines • ▼ Show 20 Lines
} }
/* /*
* Creates rtentry and nexthop based on @info data. * Creates rtentry and nexthop based on @info data.
* Return 0 and fills in rtentry into @prt on success, * Return 0 and fills in rtentry into @prt on success,
* return errno otherwise. * return errno otherwise.
*/ */
static int static int
create_rtentry(struct rib_head *rnh, struct rt_addrinfo *info, create_rtentry(struct rib_head *rnh, struct rt_addrinfo *info,
melifaroUnsubmitted
Done
Inline Actions

Mind renaming to something like check_gateway_family() to match verb_description pattern for other static functions?
Also: if you have cycles it would be good to spin up a separate diff, targetting moving the existing checks to a separate function. I can land it before this diff, thus simplifying this one.

melifaro: Mind renaming to something like `check_gateway_family()` to match verb_description pattern for…
struct rtentry **prt) struct rtentry **prt)
{ {
struct sockaddr *dst, *ndst, *gateway, *netmask; struct sockaddr *dst, *ndst, *gateway, *netmask;
struct rtentry *rt; struct rtentry *rt;
struct nhop_object *nh; struct nhop_object *nh;
struct ifaddr *ifa; struct ifaddr *ifa;
int error, flags; int error, flags;
dst = info->rti_info[RTAX_DST]; dst = info->rti_info[RTAX_DST];
gateway = info->rti_info[RTAX_GATEWAY]; gateway = info->rti_info[RTAX_GATEWAY];
netmask = info->rti_info[RTAX_NETMASK]; netmask = info->rti_info[RTAX_NETMASK];
flags = info->rti_flags; flags = info->rti_flags;
if ((flags & RTF_GATEWAY) && !gateway) if ((flags & RTF_GATEWAY) && !gateway)
return (EINVAL); return (EINVAL);
if (dst && gateway && (dst->sa_family != gateway->sa_family) && if (dst && gateway && (dst->sa_family != gateway->sa_family) &&
melifaroUnsubmitted
Done
Inline Actions

Probably worth moving to a separate function to improve readability

melifaro: Probably worth moving to a separate function to improve readability
(gateway->sa_family != AF_UNSPEC) && (gateway->sa_family != AF_LINK)) (gateway->sa_family != AF_UNSPEC) && (gateway->sa_family != AF_LINK)) {
if (dst->sa_family == AF_INET
&& gateway->sa_family == AF_INET6
&& rib_can_ipv6_nexthop_address(rnh)) {
} /* else if (dst->sa_family == AF_INET6
&& gateway->sa_family == AF_INET
&& !rib_can_ipv4_nexthop_address(rnh)) {
} */ else
return (EINVAL); return (EINVAL);
}
if (dst->sa_len > sizeof(((struct rtentry *)NULL)->rt_dstb)) if (dst->sa_len > sizeof(((struct rtentry *)NULL)->rt_dstb))
return (EINVAL); return (EINVAL);
if (info->rti_ifa == NULL) { if (info->rti_ifa == NULL) {
error = rt_getifa_fib(info, rnh->rib_fibnum); error = rt_getifa_fib(info, rnh->rib_fibnum);
if (error) if (error)
return (error); return (error);
▲ Show 20 Lines • Show All 941 Lines • Show Last 20 Lines