/*
- * Copyright (c) 2000-2016 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2019 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
#include <sys/syslog.h>
#include <sys/mcache.h>
#include <kern/locks.h>
+#include <sys/codesign.h>
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>
#include <netinet/in_var.h>
#include <netinet/in_arp.h>
+#include <netinet/ip.h>
+#include <netinet/ip6.h>
#include <netinet6/nd6.h>
extern struct rtstat rtstat;
MALLOC_DEFINE(M_RTABLE, "routetbl", "routing tables");
-static struct sockaddr route_dst = { 2, PF_ROUTE, { 0, } };
-static struct sockaddr route_src = { 2, PF_ROUTE, { 0, } };
-static struct sockaddr sa_zero = { sizeof (sa_zero), AF_INET, { 0, } };
+static struct sockaddr route_dst = { .sa_len = 2, .sa_family = PF_ROUTE, .sa_data = { 0, } };
+static struct sockaddr route_src = { .sa_len = 2, .sa_family = PF_ROUTE, .sa_data = { 0, } };
+static struct sockaddr sa_zero = { .sa_len = sizeof(sa_zero), .sa_family = AF_INET, .sa_data = { 0, } };
struct route_cb {
- u_int32_t ip_count; /* attached w/ AF_INET */
- u_int32_t ip6_count; /* attached w/ AF_INET6 */
- u_int32_t any_count; /* total attached */
+ u_int32_t ip_count; /* attached w/ AF_INET */
+ u_int32_t ip6_count; /* attached w/ AF_INET6 */
+ u_int32_t any_count; /* total attached */
};
static struct route_cb route_cb;
struct walkarg {
- int w_tmemsize;
- int w_op, w_arg;
- caddr_t w_tmem;
+ int w_tmemsize;
+ int w_op, w_arg;
+ caddr_t w_tmem;
struct sysctl_req *w_req;
};
static int sysctl_rtsock SYSCTL_HANDLER_ARGS;
SYSCTL_NODE(_net, PF_ROUTE, routetable, CTLFLAG_RD | CTLFLAG_LOCKED,
- sysctl_rtsock, "");
+ sysctl_rtsock, "");
-SYSCTL_NODE(_net, OID_AUTO, route, CTLFLAG_RW|CTLFLAG_LOCKED, 0, "routing");
+SYSCTL_NODE(_net, OID_AUTO, route, CTLFLAG_RW | CTLFLAG_LOCKED, 0, "routing");
-#define ROUNDUP32(a) \
- ((a) > 0 ? (1 + (((a) - 1) | (sizeof (uint32_t) - 1))) : \
+/* Align x to 1024 (only power of 2) assuming x is positive */
+#define ALIGN_BYTES(x) do { \
+ x = P2ALIGN(x, 1024); \
+} while(0)
+
+#define ROUNDUP32(a) \
+ ((a) > 0 ? (1 + (((a) - 1) | (sizeof (uint32_t) - 1))) : \
sizeof (uint32_t))
-#define ADVANCE32(x, n) \
+#define ADVANCE32(x, n) \
(x += ROUNDUP32((n)->sa_len))
+#define RT_HAS_IFADDR(rt) \
+ ((rt)->rt_ifa != NULL && (rt)->rt_ifa->ifa_addr != NULL)
+
/*
* It really doesn't make any sense at all for this code to share much
* with raw_usrreq.c, since its functionality is so restricted. XXX
static int
rts_abort(struct socket *so)
{
- return (raw_usrreqs.pru_abort(so));
+ return raw_usrreqs.pru_abort(so);
}
/* pru_accept is EOPNOTSUPP */
VERIFY(so->so_pcb == NULL);
- MALLOC(rp, struct rawcb *, sizeof (*rp), M_PCB, M_WAITOK | M_ZERO);
- if (rp == NULL)
- return (ENOBUFS);
+ MALLOC(rp, struct rawcb *, sizeof(*rp), M_PCB, M_WAITOK | M_ZERO);
+ if (rp == NULL) {
+ return ENOBUFS;
+ }
so->so_pcb = (caddr_t)rp;
/* don't use raw_usrreqs.pru_attach, it checks for SS_PRIV */
FREE(rp, M_PCB);
so->so_pcb = NULL;
so->so_flags |= SOF_PCBCLEARING;
- return (error);
+ return error;
}
switch (rp->rcb_proto.sp_protocol) {
/* the socket is already locked when we enter rts_attach */
soisconnected(so);
so->so_options |= SO_USELOOPBACK;
- return (0);
+ return 0;
}
static int
rts_bind(struct socket *so, struct sockaddr *nam, struct proc *p)
{
- return (raw_usrreqs.pru_bind(so, nam, p)); /* xxx just EINVAL */
+ return raw_usrreqs.pru_bind(so, nam, p); /* xxx just EINVAL */
}
static int
rts_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
{
- return (raw_usrreqs.pru_connect(so, nam, p)); /* XXX just EINVAL */
+ return raw_usrreqs.pru_connect(so, nam, p); /* XXX just EINVAL */
}
/* pru_connect2 is EOPNOTSUPP */
break;
}
atomic_add_32(&route_cb.any_count, -1);
- return (raw_usrreqs.pru_detach(so));
+ return raw_usrreqs.pru_detach(so);
}
static int
rts_disconnect(struct socket *so)
{
- return (raw_usrreqs.pru_disconnect(so));
+ return raw_usrreqs.pru_disconnect(so);
}
/* pru_listen is EOPNOTSUPP */
static int
rts_peeraddr(struct socket *so, struct sockaddr **nam)
{
- return (raw_usrreqs.pru_peeraddr(so, nam));
+ return raw_usrreqs.pru_peeraddr(so, nam);
}
/* pru_rcvd is EOPNOTSUPP */
rts_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
struct mbuf *control, struct proc *p)
{
- return (raw_usrreqs.pru_send(so, flags, m, nam, control, p));
+ return raw_usrreqs.pru_send(so, flags, m, nam, control, p);
}
/* pru_sense is null */
static int
rts_shutdown(struct socket *so)
{
- return (raw_usrreqs.pru_shutdown(so));
+ return raw_usrreqs.pru_shutdown(so);
}
static int
rts_sockaddr(struct socket *so, struct sockaddr **nam)
{
- return (raw_usrreqs.pru_sockaddr(so, nam));
+ return raw_usrreqs.pru_sockaddr(so, nam);
}
static struct pr_usrreqs route_usrreqs = {
- .pru_abort = rts_abort,
- .pru_attach = rts_attach,
- .pru_bind = rts_bind,
- .pru_connect = rts_connect,
- .pru_detach = rts_detach,
- .pru_disconnect = rts_disconnect,
- .pru_peeraddr = rts_peeraddr,
- .pru_send = rts_send,
- .pru_shutdown = rts_shutdown,
- .pru_sockaddr = rts_sockaddr,
- .pru_sosend = sosend,
- .pru_soreceive = soreceive,
+ .pru_abort = rts_abort,
+ .pru_attach = rts_attach,
+ .pru_bind = rts_bind,
+ .pru_connect = rts_connect,
+ .pru_detach = rts_detach,
+ .pru_disconnect = rts_disconnect,
+ .pru_peeraddr = rts_peeraddr,
+ .pru_send = rts_send,
+ .pru_shutdown = rts_shutdown,
+ .pru_sockaddr = rts_sockaddr,
+ .pru_sosend = sosend,
+ .pru_soreceive = soreceive,
};
/*ARGSUSED*/
int sendonlytoself = 0;
unsigned int ifscope = IFSCOPE_NONE;
struct rawcb *rp = NULL;
-
-#define senderr(e) { error = (e); goto flush; }
- if (m == NULL || ((m->m_len < sizeof (intptr_t)) &&
- (m = m_pullup(m, sizeof (intptr_t))) == NULL))
- return (ENOBUFS);
+ boolean_t is_router = FALSE;
+#define senderr(e) { error = (e); goto flush; }
+ if (m == NULL || ((m->m_len < sizeof(intptr_t)) &&
+ (m = m_pullup(m, sizeof(intptr_t))) == NULL)) {
+ return ENOBUFS;
+ }
VERIFY(m->m_flags & M_PKTHDR);
/*
lck_mtx_lock(rnh_lock);
len = m->m_pkthdr.len;
- if (len < sizeof (*rtm) ||
+ if (len < sizeof(*rtm) ||
len != mtod(m, struct rt_msghdr *)->rtm_msglen) {
info.rti_info[RTAX_DST] = NULL;
senderr(EINVAL);
* all RTM_GETs to be silent in the future, so this is private for now.
*/
if (rtm->rtm_type == RTM_GET_SILENT) {
- if (!(so->so_options & SO_USELOOPBACK))
+ if (!(so->so_options & SO_USELOOPBACK)) {
senderr(EINVAL);
+ }
sendonlytoself = 1;
rtm->rtm_type = RTM_GET;
}
if (info.rti_info[RTAX_DST] == NULL ||
info.rti_info[RTAX_DST]->sa_family >= AF_MAX ||
(info.rti_info[RTAX_GATEWAY] != NULL &&
- info.rti_info[RTAX_GATEWAY]->sa_family >= AF_MAX))
+ info.rti_info[RTAX_GATEWAY]->sa_family >= AF_MAX)) {
senderr(EINVAL);
+ }
if (info.rti_info[RTAX_DST]->sa_family == AF_INET &&
- info.rti_info[RTAX_DST]->sa_len != sizeof (dst_in)) {
+ info.rti_info[RTAX_DST]->sa_len != sizeof(struct sockaddr_in)) {
/* At minimum, we need up to sin_addr */
if (info.rti_info[RTAX_DST]->sa_len <
- offsetof(struct sockaddr_in, sin_zero))
+ offsetof(struct sockaddr_in, sin_zero)) {
senderr(EINVAL);
- bzero(&dst_in, sizeof (dst_in));
- dst_in.sin_len = sizeof (dst_in);
+ }
+ bzero(&dst_in, sizeof(dst_in));
+ dst_in.sin_len = sizeof(dst_in);
dst_in.sin_family = AF_INET;
dst_in.sin_port = SIN(info.rti_info[RTAX_DST])->sin_port;
dst_in.sin_addr = SIN(info.rti_info[RTAX_DST])->sin_addr;
info.rti_info[RTAX_DST] = (struct sockaddr *)&dst_in;
dst_sa_family = info.rti_info[RTAX_DST]->sa_family;
+ } else if (info.rti_info[RTAX_DST]->sa_family == AF_INET6 &&
+ info.rti_info[RTAX_DST]->sa_len < sizeof(struct sockaddr_in6)) {
+ senderr(EINVAL);
}
- if (info.rti_info[RTAX_GATEWAY] != NULL &&
- info.rti_info[RTAX_GATEWAY]->sa_family == AF_INET &&
- info.rti_info[RTAX_GATEWAY]->sa_len != sizeof (gate_in)) {
- /* At minimum, we need up to sin_addr */
- if (info.rti_info[RTAX_GATEWAY]->sa_len <
- offsetof(struct sockaddr_in, sin_zero))
+ if (info.rti_info[RTAX_GATEWAY] != NULL) {
+ if (info.rti_info[RTAX_GATEWAY]->sa_family == AF_INET &&
+ info.rti_info[RTAX_GATEWAY]->sa_len != sizeof(struct sockaddr_in)) {
+ /* At minimum, we need up to sin_addr */
+ if (info.rti_info[RTAX_GATEWAY]->sa_len <
+ offsetof(struct sockaddr_in, sin_zero)) {
+ senderr(EINVAL);
+ }
+ bzero(&gate_in, sizeof(gate_in));
+ gate_in.sin_len = sizeof(gate_in);
+ gate_in.sin_family = AF_INET;
+ gate_in.sin_port = SIN(info.rti_info[RTAX_GATEWAY])->sin_port;
+ gate_in.sin_addr = SIN(info.rti_info[RTAX_GATEWAY])->sin_addr;
+ info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&gate_in;
+ } else if (info.rti_info[RTAX_GATEWAY]->sa_family == AF_INET6 &&
+ info.rti_info[RTAX_GATEWAY]->sa_len < sizeof(struct sockaddr_in6)) {
senderr(EINVAL);
- bzero(&gate_in, sizeof (gate_in));
- gate_in.sin_len = sizeof (gate_in);
- gate_in.sin_family = AF_INET;
- gate_in.sin_port = SIN(info.rti_info[RTAX_GATEWAY])->sin_port;
- gate_in.sin_addr = SIN(info.rti_info[RTAX_GATEWAY])->sin_addr;
- info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&gate_in;
+ }
}
if (info.rti_info[RTAX_GENMASK]) {
struct radix_node *t;
t = rn_addmask((caddr_t)info.rti_info[RTAX_GENMASK], 0, 1);
if (t != NULL && Bcmp(info.rti_info[RTAX_GENMASK],
- t->rn_key, *(u_char *)info.rti_info[RTAX_GENMASK]) == 0)
+ t->rn_key, *(u_char *)info.rti_info[RTAX_GENMASK]) == 0) {
info.rti_info[RTAX_GENMASK] =
(struct sockaddr *)(t->rn_key);
- else
+ } else {
senderr(ENOBUFS);
+ }
}
/*
*/
if (rtm->rtm_flags & RTF_IFSCOPE) {
if (info.rti_info[RTAX_DST]->sa_family != AF_INET &&
- info.rti_info[RTAX_DST]->sa_family != AF_INET6)
+ info.rti_info[RTAX_DST]->sa_family != AF_INET6) {
senderr(EINVAL);
+ }
ifscope = rtm->rtm_index;
}
+ /*
+ * Block changes on INTCOPROC interfaces.
+ */
+ if (ifscope) {
+ unsigned int intcoproc_scope = 0;
+ ifnet_head_lock_shared();
+ TAILQ_FOREACH(ifp, &ifnet_head, if_link) {
+ if (IFNET_IS_INTCOPROC(ifp)) {
+ intcoproc_scope = ifp->if_index;
+ break;
+ }
+ }
+ ifnet_head_done();
+ if (intcoproc_scope == ifscope && current_proc()->p_pid != 0) {
+ senderr(EINVAL);
+ }
+ }
/*
* RTF_PROXY can only be set internally from within the kernel.
*/
- if (rtm->rtm_flags & RTF_PROXY)
+ if (rtm->rtm_flags & RTF_PROXY) {
senderr(EINVAL);
+ }
/*
* For AF_INET, always zero out the embedded scope ID. If this is
* false interpretation of the scope ID because it's using the sin_zero
* field, which might not be properly cleared by the requestor.
*/
- if (info.rti_info[RTAX_DST]->sa_family == AF_INET)
+ if (info.rti_info[RTAX_DST]->sa_family == AF_INET) {
sin_set_ifscope(info.rti_info[RTAX_DST], IFSCOPE_NONE);
+ }
if (info.rti_info[RTAX_GATEWAY] != NULL &&
- info.rti_info[RTAX_GATEWAY]->sa_family == AF_INET)
+ info.rti_info[RTAX_GATEWAY]->sa_family == AF_INET) {
sin_set_ifscope(info.rti_info[RTAX_GATEWAY], IFSCOPE_NONE);
-
+ }
switch (rtm->rtm_type) {
case RTM_ADD:
- if (info.rti_info[RTAX_GATEWAY] == NULL)
+ if (info.rti_info[RTAX_GATEWAY] == NULL) {
senderr(EINVAL);
+ }
error = rtrequest_scoped_locked(RTM_ADD,
info.rti_info[RTAX_DST], info.rti_info[RTAX_GATEWAY],
case RTM_CHANGE:
case RTM_LOCK:
rnh = rt_tables[info.rti_info[RTAX_DST]->sa_family];
- if (rnh == NULL)
+ if (rnh == NULL) {
senderr(EAFNOSUPPORT);
+ }
/*
* Lookup the best match based on the key-mask pair;
* callee adds a reference and checks for root node.
*/
rt = rt_lookup(TRUE, info.rti_info[RTAX_DST],
info.rti_info[RTAX_NETMASK], rnh, ifscope);
- if (rt == NULL)
+ if (rt == NULL) {
senderr(ESRCH);
+ }
RT_LOCK(rt);
/*
*/
switch (rtm->rtm_type) {
case RTM_GET: {
+ kauth_cred_t cred;
+ kauth_cred_t* credp;
struct ifaddr *ifa2;
report:
+ cred = kauth_cred_proc_ref(current_proc());
+ credp = &cred;
+
ifa2 = NULL;
RT_LOCK_ASSERT_HELD(rt);
info.rti_info[RTAX_DST] = rt_key(rt);
} else if ((ifp = rt->rt_ifp) != NULL) {
rtm->rtm_index = ifp->if_index;
}
- if (ifa2 != NULL)
+ if (ifa2 != NULL) {
IFA_LOCK(ifa2);
- len = rt_msg2(rtm->rtm_type, &info, NULL, NULL, NULL);
- if (ifa2 != NULL)
+ }
+ len = rt_msg2(rtm->rtm_type, &info, NULL, NULL, credp);
+ if (ifa2 != NULL) {
IFA_UNLOCK(ifa2);
- if (len > rtm->rtm_msglen) {
- struct rt_msghdr *new_rtm;
- R_Malloc(new_rtm, struct rt_msghdr *, len);
- if (new_rtm == NULL) {
- RT_UNLOCK(rt);
- if (ifa2 != NULL)
- IFA_REMREF(ifa2);
- senderr(ENOBUFS);
+ }
+ struct rt_msghdr *out_rtm;
+ R_Malloc(out_rtm, struct rt_msghdr *, len);
+ if (out_rtm == NULL) {
+ RT_UNLOCK(rt);
+ if (ifa2 != NULL) {
+ IFA_REMREF(ifa2);
}
- Bcopy(rtm, new_rtm, rtm->rtm_msglen);
- R_Free(rtm); rtm = new_rtm;
+ senderr(ENOBUFS);
}
- if (ifa2 != NULL)
+ Bcopy(rtm, out_rtm, sizeof(struct rt_msghdr));
+ if (ifa2 != NULL) {
IFA_LOCK(ifa2);
- (void) rt_msg2(rtm->rtm_type, &info, (caddr_t)rtm,
- NULL, NULL);
- if (ifa2 != NULL)
+ }
+ (void) rt_msg2(out_rtm->rtm_type, &info, (caddr_t)out_rtm,
+ NULL, &cred);
+ if (ifa2 != NULL) {
IFA_UNLOCK(ifa2);
+ }
+ R_Free(rtm);
+ rtm = out_rtm;
rtm->rtm_flags = rt->rt_flags;
rt_getmetrics(rt, &rtm->rtm_rmx);
rtm->rtm_addrs = info.rti_addrs;
- if (ifa2 != NULL)
+ if (ifa2 != NULL) {
IFA_REMREF(ifa2);
+ }
+
+ kauth_cred_unref(&cred);
break;
}
case RTM_CHANGE:
+ is_router = (rt->rt_flags & RTF_ROUTER) ? TRUE : FALSE;
+
if (info.rti_info[RTAX_GATEWAY] != NULL &&
(error = rt_setgate(rt, rt_key(rt),
info.rti_info[RTAX_GATEWAY]))) {
* the required gateway, then just use the old one.
* This can happen if the user tries to change the
* flags on the default route without changing the
- * default gateway. Changing flags still doesn't work.
+ * default gateway. Changing flags still doesn't work.
*/
if ((rt->rt_flags & RTF_GATEWAY) &&
- info.rti_info[RTAX_GATEWAY] == NULL)
+ info.rti_info[RTAX_GATEWAY] == NULL) {
info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
+ }
/*
* On Darwin, we call rt_setif which contains the
if ((error = rt_setmetrics(rtm->rtm_inits,
&rtm->rtm_rmx, rt))) {
- int tmp = error;
- RT_UNLOCK(rt);
- senderr(tmp);
+ int tmp = error;
+ RT_UNLOCK(rt);
+ senderr(tmp);
}
- if (info.rti_info[RTAX_GENMASK])
+ if (info.rti_info[RTAX_GENMASK]) {
rt->rt_genmask = info.rti_info[RTAX_GENMASK];
- /* FALLTHRU */
+ }
+
+ /*
+ * Enqueue work item to invoke callback for this route entry
+ * This may not be needed always, but for now issue it anytime
+ * RTM_CHANGE gets called.
+ */
+ route_event_enqueue_nwk_wq_entry(rt, NULL, ROUTE_ENTRY_REFRESH, NULL, TRUE);
+ /*
+ * If the route is for a router, walk the tree to send refresh
+ * event to protocol cloned entries
+ */
+ if (is_router) {
+ struct route_event rt_ev;
+ route_event_init(&rt_ev, rt, NULL, ROUTE_ENTRY_REFRESH);
+ RT_UNLOCK(rt);
+ (void) rnh->rnh_walktree(rnh, route_event_walktree, (void *)&rt_ev);
+ RT_LOCK(rt);
+ }
+ /* FALLTHRU */
case RTM_LOCK:
rt->rt_rmx.rmx_locks &= ~(rtm->rtm_inits);
rt->rt_rmx.rmx_locks |=
}
RT_UNLOCK(rt);
break;
-
default:
senderr(EOPNOTSUPP);
}
flush:
if (rtm != NULL) {
- if (error)
+ if (error) {
rtm->rtm_errno = error;
- else
+ } else {
rtm->rtm_flags |= RTF_DONE;
+ }
}
if (rt != NULL) {
RT_LOCK_ASSERT_NOTHELD(rt);
*/
if (!(so->so_options & SO_USELOOPBACK)) {
if (route_cb.any_count <= 1) {
- if (rtm != NULL)
+ if (rtm != NULL) {
R_Free(rtm);
+ }
m_freem(m);
- return (error);
+ return error;
}
/* There is another listener, so construct message */
rp = sotorawcb(so);
NULL, &error) != 0) {
sorwakeup(so);
}
- if (error)
- return (error);
+ if (error) {
+ return error;
+ }
} else {
- struct sockproto route_proto = { PF_ROUTE, 0 };
- if (rp != NULL)
+ struct sockproto route_proto = { .sp_family = PF_ROUTE, .sp_protocol = 0 };
+ if (rp != NULL) {
rp->rcb_proto.sp_family = 0; /* Avoid us */
- if (dst_sa_family != 0)
+ }
+ if (dst_sa_family != 0) {
route_proto.sp_protocol = dst_sa_family;
+ }
if (m != NULL) {
socket_unlock(so, 0);
raw_input(m, &route_proto, &route_src, &route_dst);
socket_lock(so, 0);
}
- if (rp != NULL)
+ if (rp != NULL) {
rp->rcb_proto.sp_family = PF_ROUTE;
+ }
}
- return (error);
+ return error;
}
void
if (!(which & RTV_REFRESH_HOST)) {
struct timeval caltime;
getmicrotime(&caltime);
-#define metric(f, e) if (which & (f)) out->rt_rmx.e = in->e;
+#define metric(f, e) if (which & (f)) out->rt_rmx.e = in->e;
metric(RTV_RPIPE, rmx_recvpipe);
metric(RTV_SPIPE, rmx_sendpipe);
metric(RTV_SSTHRESH, rmx_ssthresh);
/* account for system time change */
getmicrotime(&caltime);
out->base_calendartime +=
- NET_CALCULATE_CLOCKSKEW(caltime,
- out->base_calendartime,
- net_uptime(), out->base_uptime);
+ NET_CALCULATE_CLOCKSKEW(caltime,
+ out->base_calendartime,
+ net_uptime(), out->base_uptime);
rt_setexpire(out,
- out->rt_rmx.rmx_expire -
- out->base_calendartime +
- out->base_uptime);
+ out->rt_rmx.rmx_expire -
+ out->base_calendartime +
+ out->base_uptime);
} else {
rt_setexpire(out, 0);
}
if ((which & ~RTV_REFRESH_HOST) ||
(out->rt_flags & RTF_STATIC) ||
!(out->rt_flags & RTF_LLINFO)) {
- return (EINVAL);
+ return EINVAL;
}
if (out->rt_llinfo_refresh == NULL) {
- return (ENOTSUP);
+ return ENOTSUP;
}
out->rt_llinfo_refresh(out);
}
- return (0);
+ return 0;
}
static void
struct ifnet *ifp = NULL;
void (*ifa_rtrequest)(int, struct rtentry *, struct sockaddr *);
- lck_mtx_assert(rnh_lock, LCK_MTX_ASSERT_OWNED);
+ LCK_MTX_ASSERT(rnh_lock, LCK_MTX_ASSERT_OWNED);
RT_LOCK_ASSERT_HELD(rt);
/* Don't update a defunct route */
- if (rt->rt_flags & RTF_CONDEMNED)
+ if (rt->rt_flags & RTF_CONDEMNED) {
return;
+ }
/* Add an extra ref for ourselves */
RT_ADDREF_LOCKED(rt);
} else {
ifnet_lock_shared(ifp);
ifa = TAILQ_FIRST(&ifp->if_addrhead);
- if (ifa != NULL)
+ if (ifa != NULL) {
IFA_ADDREF(ifa);
+ }
ifnet_lock_done(ifp);
}
} else if (Ifaaddr &&
*/
RT_UNLOCK(rt);
if ((ifa = ifa_ifwithroute_scoped_locked(rt->rt_flags,
- rt_key(rt), Gate, ifscope)) != NULL)
+ rt_key(rt), Gate, ifscope)) != NULL) {
ifp = ifa->ifa_ifp;
+ }
RT_LOCK(rt);
/* Don't update a defunct route */
if (rt->rt_flags & RTF_CONDEMNED) {
- if (ifa != NULL)
+ if (ifa != NULL) {
IFA_REMREF(ifa);
+ }
/* Release extra ref */
RT_REMREF_LOCKED(rt);
return;
}
/* trigger route cache reevaluation */
- if (rt_key(rt)->sa_family == AF_INET)
+ if (rt_key(rt)->sa_family == AF_INET) {
routegenid_inet_update();
+ }
#if INET6
- else if (rt_key(rt)->sa_family == AF_INET6)
+ else if (rt_key(rt)->sa_family == AF_INET6) {
routegenid_inet6_update();
+ }
#endif /* INET6 */
if (ifa != NULL) {
IFA_LOCK_SPIN(oifa);
ifa_rtrequest = oifa->ifa_rtrequest;
IFA_UNLOCK(oifa);
- if (ifa_rtrequest != NULL)
+ if (ifa_rtrequest != NULL) {
ifa_rtrequest(RTM_DELETE, rt, Gate);
+ }
}
rtsetifa(rt, ifa);
/*
* Purge any link-layer info caching.
*/
- if (rt->rt_llinfo_purge != NULL)
+ if (rt->rt_llinfo_purge != NULL) {
rt->rt_llinfo_purge(rt);
+ }
/*
* Adjust route ref count for the interfaces.
* If rmx_mtu is not locked, update it
* to the MTU used by the new interface.
*/
- if (!(rt->rt_rmx.rmx_locks & RTV_MTU))
+ if (!(rt->rt_rmx.rmx_locks & RTV_MTU)) {
rt->rt_rmx.rmx_mtu = rt->rt_ifp->if_mtu;
+ if (rt_key(rt)->sa_family == AF_INET &&
+ INTF_ADJUST_MTU_FOR_CLAT46(ifp)) {
+ rt->rt_rmx.rmx_mtu = IN6_LINKMTU(rt->rt_ifp);
+ /* Further adjust the size for CLAT46 expansion */
+ rt->rt_rmx.rmx_mtu -= CLAT46_HDR_EXPANSION_OVERHD;
+ }
+ }
if (rt->rt_ifa != NULL) {
IFA_LOCK_SPIN(rt->rt_ifa);
ifa_rtrequest = rt->rt_ifa->ifa_rtrequest;
IFA_UNLOCK(rt->rt_ifa);
- if (ifa_rtrequest != NULL)
+ if (ifa_rtrequest != NULL) {
ifa_rtrequest(RTM_ADD, rt, Gate);
+ }
}
IFA_REMREF(ifa);
/* Release extra ref */
IFA_LOCK_SPIN(rt->rt_ifa);
ifa_rtrequest = rt->rt_ifa->ifa_rtrequest;
IFA_UNLOCK(rt->rt_ifa);
- if (ifa_rtrequest != NULL)
+ if (ifa_rtrequest != NULL) {
ifa_rtrequest(RTM_ADD, rt, Gate);
+ }
}
/*
(rt->rt_flags & RTF_HOST) && rt->rt_ifa->ifa_ifp == rt->rt_ifp) {
ifa = ifa_ifwithaddr(rt_key(rt));
if (ifa != NULL) {
- if (ifa != rt->rt_ifa)
+ if (ifa != rt->rt_ifa) {
rtsetifa(rt, ifa);
+ }
IFA_REMREF(ifa);
}
}
struct sockaddr *sa;
int i;
- bzero(rtinfo->rti_info, sizeof (rtinfo->rti_info));
+ bzero(rtinfo->rti_info, sizeof(rtinfo->rti_info));
for (i = 0; (i < RTAX_MAX) && (cp < cplim); i++) {
- if ((rtinfo->rti_addrs & (1 << i)) == 0)
+ if ((rtinfo->rti_addrs & (1 << i)) == 0) {
continue;
+ }
sa = (struct sockaddr *)cp;
/*
* It won't fit.
*/
- if ((cp + sa->sa_len) > cplim)
- return (EINVAL);
+ if ((cp + sa->sa_len) > cplim) {
+ return EINVAL;
+ }
/*
* there are no more.. quit now
* If there are more bits, they are in error.
*/
if (sa->sa_len == 0) {
rtinfo->rti_info[i] = &sa_zero;
- return (0); /* should be EINVAL but for compat */
+ return 0; /* should be EINVAL but for compat */
}
/* accept it */
rtinfo->rti_info[i] = sa;
ADVANCE32(cp, sa);
}
- return (0);
+ return 0;
}
static struct mbuf *
int len, dlen, off;
switch (type) {
-
case RTM_DELADDR:
case RTM_NEWADDR:
- len = sizeof (struct ifa_msghdr);
+ len = sizeof(struct ifa_msghdr);
break;
case RTM_DELMADDR:
case RTM_NEWMADDR:
- len = sizeof (struct ifma_msghdr);
+ len = sizeof(struct ifma_msghdr);
break;
case RTM_IFINFO:
- len = sizeof (struct if_msghdr);
+ len = sizeof(struct if_msghdr);
break;
default:
- len = sizeof (struct rt_msghdr);
+ len = sizeof(struct rt_msghdr);
}
m = m_gethdr(M_DONTWAIT, MT_DATA);
if (m && len > MHLEN) {
m = NULL;
}
}
- if (m == NULL)
- return (NULL);
+ if (m == NULL) {
+ return NULL;
+ }
m->m_pkthdr.len = m->m_len = len;
m->m_pkthdr.rcvif = NULL;
rtm = mtod(m, struct rt_msghdr *);
/*
* Make sure to accomodate the largest possible size of sa_len.
*/
- _CASSERT(sizeof (ssbuf) == (SOCK_MAXADDRLEN + 1));
+ _CASSERT(sizeof(ssbuf) == (SOCK_MAXADDRLEN + 1));
- if ((sa = rtinfo->rti_info[i]) == NULL)
+ if ((sa = rtinfo->rti_info[i]) == NULL) {
continue;
+ }
switch (i) {
case RTAX_DST:
case RTAX_NETMASK:
- if ((hint = rtinfo->rti_info[RTAX_DST]) == NULL)
+ if ((hint = rtinfo->rti_info[RTAX_DST]) == NULL) {
hint = rtinfo->rti_info[RTAX_IFA];
+ }
/* Scrub away any trace of embedded interface scope */
sa = rtm_scrub(type, i, hint, sa, &ssbuf,
- sizeof (ssbuf), NULL);
+ sizeof(ssbuf), NULL);
break;
default:
}
if (m->m_pkthdr.len != len) {
m_freem(m);
- return (NULL);
+ return NULL;
}
rtm->rtm_msglen = len;
rtm->rtm_version = RTM_VERSION;
rtm->rtm_type = type;
- return (m);
+ return m;
}
static int
rt_msg2(int type, struct rt_addrinfo *rtinfo, caddr_t cp, struct walkarg *w,
- kauth_cred_t* credp)
+ kauth_cred_t* credp)
{
int i;
int len, dlen, rlen, second_time = 0;
rtinfo->rti_addrs = 0;
again:
switch (type) {
-
case RTM_DELADDR:
case RTM_NEWADDR:
- len = sizeof (struct ifa_msghdr);
+ len = sizeof(struct ifa_msghdr);
break;
case RTM_DELMADDR:
case RTM_NEWMADDR:
- len = sizeof (struct ifma_msghdr);
+ len = sizeof(struct ifma_msghdr);
break;
case RTM_IFINFO:
- len = sizeof (struct if_msghdr);
+ len = sizeof(struct if_msghdr);
break;
case RTM_IFINFO2:
- len = sizeof (struct if_msghdr2);
+ len = sizeof(struct if_msghdr2);
break;
case RTM_NEWMADDR2:
- len = sizeof (struct ifma_msghdr2);
+ len = sizeof(struct ifma_msghdr2);
break;
case RTM_GET_EXT:
- len = sizeof (struct rt_msghdr_ext);
+ len = sizeof(struct rt_msghdr_ext);
break;
case RTM_GET2:
- len = sizeof (struct rt_msghdr2);
+ len = sizeof(struct rt_msghdr2);
break;
default:
- len = sizeof (struct rt_msghdr);
+ len = sizeof(struct rt_msghdr);
}
cp0 = cp;
- if (cp0)
+ if (cp0) {
cp += len;
+ }
for (i = 0; i < RTAX_MAX; i++) {
struct sockaddr *sa, *hint;
uint8_t ssbuf[SOCK_MAXADDRLEN + 1];
/*
* Make sure to accomodate the largest possible size of sa_len.
*/
- _CASSERT(sizeof (ssbuf) == (SOCK_MAXADDRLEN + 1));
+ _CASSERT(sizeof(ssbuf) == (SOCK_MAXADDRLEN + 1));
- if ((sa = rtinfo->rti_info[i]) == NULL)
+ if ((sa = rtinfo->rti_info[i]) == NULL) {
continue;
+ }
switch (i) {
case RTAX_DST:
case RTAX_NETMASK:
- if ((hint = rtinfo->rti_info[RTAX_DST]) == NULL)
+ if ((hint = rtinfo->rti_info[RTAX_DST]) == NULL) {
hint = rtinfo->rti_info[RTAX_IFA];
+ }
/* Scrub away any trace of embedded interface scope */
sa = rtm_scrub(type, i, hint, sa, &ssbuf,
- sizeof (ssbuf), NULL);
+ sizeof(ssbuf), NULL);
break;
case RTAX_GATEWAY:
case RTAX_IFP:
sa = rtm_scrub(type, i, NULL, sa, &ssbuf,
- sizeof (ssbuf), credp);
+ sizeof(ssbuf), credp);
break;
default:
rlen = ROUNDUP32(dlen);
if (cp) {
bcopy((caddr_t)sa, cp, (size_t)dlen);
- if (dlen != rlen)
+ if (dlen != rlen) {
bzero(cp + dlen, rlen - dlen);
+ }
cp += rlen;
}
len += rlen;
if (rw->w_req != NULL) {
if (rw->w_tmemsize < len) {
- if (rw->w_tmem != NULL)
+ if (rw->w_tmem != NULL) {
FREE(rw->w_tmem, M_RTABLE);
- rw->w_tmem = _MALLOC(len, M_RTABLE, M_WAITOK);
- if (rw->w_tmem != NULL)
+ }
+ rw->w_tmem = _MALLOC(len, M_RTABLE, M_ZERO | M_WAITOK);
+ if (rw->w_tmem != NULL) {
rw->w_tmemsize = len;
+ }
}
if (rw->w_tmem != NULL) {
cp = rw->w_tmem;
rtm->rtm_type = type;
rtm->rtm_msglen = len;
}
- return (len);
+ return len;
}
/*
struct rt_msghdr *rtm;
struct mbuf *m;
struct sockaddr *sa = rtinfo->rti_info[RTAX_DST];
- struct sockproto route_proto = { PF_ROUTE, 0 };
+ struct sockproto route_proto = { .sp_family = PF_ROUTE, .sp_protocol = 0 };
- if (route_cb.any_count == 0)
+ if (route_cb.any_count == 0) {
return;
+ }
m = rt_msg1(type, rtinfo);
- if (m == NULL)
+ if (m == NULL) {
return;
+ }
rtm = mtod(m, struct rt_msghdr *);
rtm->rtm_flags = RTF_DONE | flags;
rtm->rtm_errno = error;
struct if_msghdr *ifm;
struct mbuf *m;
struct rt_addrinfo info;
- struct sockproto route_proto = { PF_ROUTE, 0 };
+ struct sockproto route_proto = { .sp_family = PF_ROUTE, .sp_protocol = 0 };
- if (route_cb.any_count == 0)
+ if (route_cb.any_count == 0) {
return;
- bzero((caddr_t)&info, sizeof (info));
+ }
+ bzero((caddr_t)&info, sizeof(info));
m = rt_msg1(RTM_IFINFO, &info);
- if (m == NULL)
+ if (m == NULL) {
return;
+ }
ifm = mtod(m, struct if_msghdr *);
ifm->ifm_index = ifp->if_index;
ifm->ifm_flags = (u_short)ifp->if_flags;
int pass;
struct mbuf *m = 0;
struct ifnet *ifp = ifa->ifa_ifp;
- struct sockproto route_proto = { PF_ROUTE, 0 };
+ struct sockproto route_proto = { .sp_family = PF_ROUTE, .sp_protocol = 0 };
- lck_mtx_assert(rnh_lock, LCK_MTX_ASSERT_OWNED);
+ LCK_MTX_ASSERT(rnh_lock, LCK_MTX_ASSERT_OWNED);
RT_LOCK_ASSERT_HELD(rt);
- if (route_cb.any_count == 0)
+ if (route_cb.any_count == 0) {
return;
+ }
/* Become a regular mutex, just in case */
RT_CONVERT_LOCK(rt);
for (pass = 1; pass < 3; pass++) {
- bzero((caddr_t)&info, sizeof (info));
+ bzero((caddr_t)&info, sizeof(info));
if ((cmd == RTM_ADD && pass == 1) ||
(cmd == RTM_DELETE && pass == 2)) {
struct ifa_msghdr *ifam;
(cmd == RTM_DELETE && pass == 1)) {
struct rt_msghdr *rtm;
- if (rt == NULL)
+ if (rt == NULL) {
continue;
+ }
info.rti_info[RTAX_NETMASK] = rt_mask(rt);
info.rti_info[RTAX_DST] = sa = rt_key(rt);
info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
- if ((m = rt_msg1(cmd, &info)) == NULL)
+ if ((m = rt_msg1(cmd, &info)) == NULL) {
continue;
+ }
rtm = mtod(m, struct rt_msghdr *);
rtm->rtm_index = ifp->if_index;
rtm->rtm_flags |= rt->rt_flags;
struct mbuf *m = 0;
struct ifnet *ifp = ifma->ifma_ifp;
struct ifma_msghdr *ifmam;
- struct sockproto route_proto = { PF_ROUTE, 0 };
+ struct sockproto route_proto = { .sp_family = PF_ROUTE, .sp_protocol = 0 };
- if (route_cb.any_count == 0)
+ if (route_cb.any_count == 0) {
return;
+ }
/* Lock ifp for if_lladdr */
ifnet_lock_shared(ifp);
- bzero((caddr_t)&info, sizeof (info));
+ bzero((caddr_t)&info, sizeof(info));
IFMA_LOCK(ifma);
info.rti_info[RTAX_IFA] = ifma->ifma_addr;
/* lladdr doesn't need lock */
break;
}
- return (c);
+ return c;
}
/*
int error = 0, size;
struct rt_addrinfo info;
kauth_cred_t cred;
+ kauth_cred_t *credp;
cred = kauth_cred_proc_ref(current_proc());
+ credp = &cred;
RT_LOCK(rt);
- if (w->w_op == NET_RT_FLAGS && !(rt->rt_flags & w->w_arg))
+ if ((w->w_op == NET_RT_FLAGS || w->w_op == NET_RT_FLAGS_PRIV) &&
+ !(rt->rt_flags & w->w_arg)) {
goto done;
- bzero((caddr_t)&info, sizeof (info));
+ }
+
+ /*
+ * If the matching route has RTF_LLINFO set, then we can skip scrubbing the MAC
+ * only if the outgoing interface is not loopback and the process has entitlement
+ * for neighbor cache read.
+ */
+ if (w->w_op == NET_RT_FLAGS_PRIV && (rt->rt_flags & RTF_LLINFO)) {
+ if (rt->rt_ifp != lo_ifp &&
+ (route_op_entitlement_check(NULL, cred, ROUTE_OP_READ, TRUE) == 0)) {
+ credp = NULL;
+ }
+ }
+
+ bzero((caddr_t)&info, sizeof(info));
info.rti_info[RTAX_DST] = rt_key(rt);
info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
info.rti_info[RTAX_NETMASK] = rt_mask(rt);
info.rti_info[RTAX_GENMASK] = rt->rt_genmask;
+ if (RT_HAS_IFADDR(rt)) {
+ info.rti_info[RTAX_IFA] = rt->rt_ifa->ifa_addr;
+ }
if (w->w_op != NET_RT_DUMP2) {
- size = rt_msg2(RTM_GET, &info, NULL, w, &cred);
+ size = rt_msg2(RTM_GET, &info, NULL, w, credp);
if (w->w_req != NULL && w->w_tmem != NULL) {
struct rt_msghdr *rtm =
(struct rt_msghdr *)(void *)w->w_tmem;
error = SYSCTL_OUT(w->w_req, (caddr_t)rtm, size);
}
} else {
- size = rt_msg2(RTM_GET2, &info, NULL, w, &cred);
+ size = rt_msg2(RTM_GET2, &info, NULL, w, credp);
if (w->w_req != NULL && w->w_tmem != NULL) {
struct rt_msghdr2 *rtm =
(struct rt_msghdr2 *)(void *)w->w_tmem;
rt_getmetrics(rt, &rtm->rtm_rmx);
rtm->rtm_index = rt->rt_ifp->if_index;
rtm->rtm_refcnt = rt->rt_refcnt;
- if (rt->rt_parent)
+ if (rt->rt_parent) {
rtm->rtm_parentflags = rt->rt_parent->rt_flags;
- else
+ } else {
rtm->rtm_parentflags = 0;
+ }
rtm->rtm_reserved = 0;
rtm->rtm_addrs = info.rti_addrs;
error = SYSCTL_OUT(w->w_req, (caddr_t)rtm, size);
done:
RT_UNLOCK(rt);
kauth_cred_unref(&cred);
- return (error);
+ return error;
}
/*
cred = kauth_cred_proc_ref(current_proc());
RT_LOCK(rt);
- if (w->w_op == NET_RT_DUMPX_FLAGS && !(rt->rt_flags & w->w_arg))
+ if (w->w_op == NET_RT_DUMPX_FLAGS && !(rt->rt_flags & w->w_arg)) {
goto done;
- bzero(&info, sizeof (info));
+ }
+ bzero(&info, sizeof(info));
info.rti_info[RTAX_DST] = rt_key(rt);
info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
info.rti_info[RTAX_NETMASK] = rt_mask(rt);
ertm->rtm_errno = 0;
ertm->rtm_addrs = info.rti_addrs;
if (rt->rt_llinfo_get_ri == NULL) {
- bzero(&ertm->rtm_ri, sizeof (ertm->rtm_ri));
+ bzero(&ertm->rtm_ri, sizeof(ertm->rtm_ri));
ertm->rtm_ri.ri_rssi = IFNET_RSSI_UNKNOWN;
ertm->rtm_ri.ri_lqm = IFNET_LQM_THRESH_OFF;
ertm->rtm_ri.ri_npm = IFNET_NPM_THRESH_UNKNOWN;
done:
RT_UNLOCK(rt);
kauth_cred_unref(&cred);
- return (error);
+ return error;
}
/*
{
struct ifnet *ifp;
struct ifaddr *ifa;
- struct rt_addrinfo info;
- int len, error = 0;
- int pass = 0;
- int total_len = 0, current_len = 0;
- char *total_buffer = NULL, *cp = NULL;
+ struct rt_addrinfo info;
+ int len = 0, error = 0;
+ int pass = 0;
+ int total_len = 0, current_len = 0;
+ char *total_buffer = NULL, *cp = NULL;
kauth_cred_t cred;
cred = kauth_cred_proc_ref(current_proc());
- bzero((caddr_t)&info, sizeof (info));
+ bzero((caddr_t)&info, sizeof(info));
for (pass = 0; pass < 2; pass++) {
ifnet_head_lock_shared();
TAILQ_FOREACH(ifp, &ifnet_head, if_link) {
- if (error)
+ if (error) {
break;
- if (w->w_arg && w->w_arg != ifp->if_index)
+ }
+ if (w->w_arg && w->w_arg != ifp->if_index) {
continue;
+ }
ifnet_lock_shared(ifp);
/*
* Holding ifnet lock here prevents the link address
if_data_internal_to_if_data(ifp, &ifp->if_data,
&ifm->ifm_data);
ifm->ifm_addrs = info.rti_addrs;
+ /*
+ * <rdar://problem/32940901>
+ * Round bytes only for non-platform
+ */
+ if (!csproc_get_platform_binary(w->w_req->p)) {
+ ALIGN_BYTES(ifm->ifm_data.ifi_ibytes);
+ ALIGN_BYTES(ifm->ifm_data.ifi_obytes);
+ }
cp += len;
- VERIFY(IS_P2ALIGNED(cp, sizeof (u_int32_t)));
+ VERIFY(IS_P2ALIGNED(cp, sizeof(u_int32_t)));
current_len += len;
}
while ((ifa = ifa->ifa_link.tqe_next) != NULL) {
IFA_UNLOCK(ifa);
continue;
}
+ if (ifa->ifa_addr->sa_family == AF_INET6 &&
+ (((struct in6_ifaddr *)ifa)->ia6_flags &
+ IN6_IFF_CLAT46) != 0) {
+ IFA_UNLOCK(ifa);
+ continue;
+ }
info.rti_info[RTAX_IFA] = ifa->ifa_addr;
info.rti_info[RTAX_NETMASK] = ifa->ifa_netmask;
info.rti_info[RTAX_BRD] = ifa->ifa_dstaddr;
cp += len;
VERIFY(IS_P2ALIGNED(cp,
- sizeof (u_int32_t)));
+ sizeof(u_int32_t)));
current_len += len;
}
IFA_UNLOCK(ifa);
ifnet_head_done();
if (error != 0) {
- if (error == ENOBUFS)
+ if (error == ENOBUFS) {
printf("%s: current_len (%d) + len (%d) > "
"total_len (%d)\n", __func__, current_len,
len, total_len);
+ }
break;
}
if (pass == 0) {
/* Better to return zero length buffer than ENOBUFS */
- if (total_len == 0)
+ if (total_len == 0) {
total_len = 1;
+ }
total_len += total_len >> 3;
total_buffer = _MALLOC(total_len, M_RTABLE,
M_ZERO | M_WAITOK);
break;
}
cp = total_buffer;
- VERIFY(IS_P2ALIGNED(cp, sizeof (u_int32_t)));
+ VERIFY(IS_P2ALIGNED(cp, sizeof(u_int32_t)));
} else {
error = SYSCTL_OUT(w->w_req, total_buffer, current_len);
- if (error)
+ if (error) {
break;
+ }
}
}
- if (total_buffer != NULL)
+ if (total_buffer != NULL) {
_FREE(total_buffer, M_RTABLE);
+ }
kauth_cred_unref(&cred);
- return (error);
+ return error;
}
static int
{
struct ifnet *ifp;
struct ifaddr *ifa;
- struct rt_addrinfo info;
- int len, error = 0;
- int pass = 0;
- int total_len = 0, current_len = 0;
- char *total_buffer = NULL, *cp = NULL;
+ struct rt_addrinfo info;
+ int len = 0, error = 0;
+ int pass = 0;
+ int total_len = 0, current_len = 0;
+ char *total_buffer = NULL, *cp = NULL;
kauth_cred_t cred;
cred = kauth_cred_proc_ref(current_proc());
- bzero((caddr_t)&info, sizeof (info));
+ bzero((caddr_t)&info, sizeof(info));
for (pass = 0; pass < 2; pass++) {
struct ifmultiaddr *ifma;
ifnet_head_lock_shared();
TAILQ_FOREACH(ifp, &ifnet_head, if_link) {
- if (error)
+ if (error) {
break;
- if (w->w_arg && w->w_arg != ifp->if_index)
+ }
+ if (w->w_arg && w->w_arg != ifp->if_index) {
continue;
+ }
ifnet_lock_shared(ifp);
/*
* Holding ifnet lock here prevents the link address
ifm->ifm_timer = ifp->if_timer;
if_data_internal_to_if_data64(ifp,
&ifp->if_data, &ifm->ifm_data);
+ /*
+ * <rdar://problem/32940901>
+ * Round bytes only for non-platform
+ */
+ if (!csproc_get_platform_binary(w->w_req->p)) {
+ ALIGN_BYTES(ifm->ifm_data.ifi_ibytes);
+ ALIGN_BYTES(ifm->ifm_data.ifi_obytes);
+ }
cp += len;
- VERIFY(IS_P2ALIGNED(cp, sizeof (u_int32_t)));
+ VERIFY(IS_P2ALIGNED(cp, sizeof(u_int32_t)));
current_len += len;
}
while ((ifa = ifa->ifa_link.tqe_next) != NULL) {
IFA_UNLOCK(ifa);
continue;
}
+ if (ifa->ifa_addr->sa_family == AF_INET6 &&
+ (((struct in6_ifaddr *)ifa)->ia6_flags &
+ IN6_IFF_CLAT46) != 0) {
+ IFA_UNLOCK(ifa);
+ continue;
+ }
+
info.rti_info[RTAX_IFA] = ifa->ifa_addr;
info.rti_info[RTAX_NETMASK] = ifa->ifa_netmask;
info.rti_info[RTAX_BRD] = ifa->ifa_dstaddr;
cp += len;
VERIFY(IS_P2ALIGNED(cp,
- sizeof (u_int32_t)));
+ sizeof(u_int32_t)));
current_len += len;
}
IFA_UNLOCK(ifa);
IFMA_UNLOCK(ifma);
continue;
}
- bzero((caddr_t)&info, sizeof (info));
+ bzero((caddr_t)&info, sizeof(info));
info.rti_info[RTAX_IFA] = ifma->ifma_addr;
/*
* Holding ifnet lock here prevents the link
*/
ifa0 = ifp->if_lladdr;
info.rti_info[RTAX_IFP] = ifa0->ifa_addr;
- if (ifma->ifma_ll != NULL)
+ if (ifma->ifma_ll != NULL) {
info.rti_info[RTAX_GATEWAY] =
ifma->ifma_ll->ifma_addr;
+ }
len = rt_msg2(RTM_NEWMADDR2, &info, NULL, NULL,
&cred);
if (pass == 0) {
cp += len;
VERIFY(IS_P2ALIGNED(cp,
- sizeof (u_int32_t)));
+ sizeof(u_int32_t)));
current_len += len;
}
IFMA_UNLOCK(ifma);
ifnet_head_done();
if (error) {
- if (error == ENOBUFS)
+ if (error == ENOBUFS) {
printf("%s: current_len (%d) + len (%d) > "
"total_len (%d)\n", __func__, current_len,
len, total_len);
+ }
break;
}
if (pass == 0) {
/* Better to return zero length buffer than ENOBUFS */
- if (total_len == 0)
+ if (total_len == 0) {
total_len = 1;
+ }
total_len += total_len >> 3;
total_buffer = _MALLOC(total_len, M_RTABLE,
M_ZERO | M_WAITOK);
break;
}
cp = total_buffer;
- VERIFY(IS_P2ALIGNED(cp, sizeof (u_int32_t)));
+ VERIFY(IS_P2ALIGNED(cp, sizeof(u_int32_t)));
} else {
error = SYSCTL_OUT(w->w_req, total_buffer, current_len);
- if (error)
+ if (error) {
break;
+ }
}
}
- if (total_buffer != NULL)
+ if (total_buffer != NULL) {
_FREE(total_buffer, M_RTABLE);
+ }
kauth_cred_unref(&cred);
- return (error);
+ return error;
}
static int
sysctl_rtstat(struct sysctl_req *req)
{
- return (SYSCTL_OUT(req, &rtstat, sizeof (struct rtstat)));
+ return SYSCTL_OUT(req, &rtstat, sizeof(struct rtstat));
}
static int
sysctl_rttrash(struct sysctl_req *req)
{
- return (SYSCTL_OUT(req, &rttrash, sizeof (rttrash)));
+ return SYSCTL_OUT(req, &rttrash, sizeof(rttrash));
}
static int
sysctl_rtsock SYSCTL_HANDLER_ARGS
{
#pragma unused(oidp)
- int *name = (int *)arg1;
- u_int namelen = arg2;
+ int *name = (int *)arg1;
+ u_int namelen = arg2;
struct radix_node_head *rnh;
- int i, error = EINVAL;
+ int i, error = EINVAL;
u_char af;
- struct walkarg w;
+ struct walkarg w;
- name ++;
+ name++;
namelen--;
- if (req->newptr)
- return (EPERM);
- if (namelen != 3)
- return (EINVAL);
+ if (req->newptr) {
+ return EPERM;
+ }
+ if (namelen != 3) {
+ return EINVAL;
+ }
af = name[0];
- Bzero(&w, sizeof (w));
+ Bzero(&w, sizeof(w));
w.w_op = name[1];
w.w_arg = name[2];
w.w_req = req;
switch (w.w_op) {
-
case NET_RT_DUMP:
case NET_RT_DUMP2:
case NET_RT_FLAGS:
+ case NET_RT_FLAGS_PRIV:
lck_mtx_lock(rnh_lock);
- for (i = 1; i <= AF_MAX; i++)
+ for (i = 1; i <= AF_MAX; i++) {
if ((rnh = rt_tables[i]) && (af == 0 || af == i) &&
(error = rnh->rnh_walktree(rnh,
- sysctl_dumpentry, &w)))
+ sysctl_dumpentry, &w))) {
break;
+ }
+ }
lck_mtx_unlock(rnh_lock);
break;
case NET_RT_DUMPX:
case NET_RT_DUMPX_FLAGS:
lck_mtx_lock(rnh_lock);
- for (i = 1; i <= AF_MAX; i++)
+ for (i = 1; i <= AF_MAX; i++) {
if ((rnh = rt_tables[i]) && (af == 0 || af == i) &&
(error = rnh->rnh_walktree(rnh,
- sysctl_dumpentry_ext, &w)))
+ sysctl_dumpentry_ext, &w))) {
break;
+ }
+ }
lck_mtx_unlock(rnh_lock);
break;
case NET_RT_IFLIST:
error = sysctl_rttrash(req);
break;
}
- if (w.w_tmem != NULL)
+ if (w.w_tmem != NULL) {
FREE(w.w_tmem, M_RTABLE);
- return (error);
+ }
+ return error;
}
/*
* Definitions of protocols supported in the ROUTE domain.
*/
static struct protosw routesw[] = {
-{
- .pr_type = SOCK_RAW,
- .pr_protocol = 0,
- .pr_flags = PR_ATOMIC|PR_ADDR,
- .pr_output = route_output,
- .pr_ctlinput = raw_ctlinput,
- .pr_init = raw_init,
- .pr_usrreqs = &route_usrreqs,
-}
+ {
+ .pr_type = SOCK_RAW,
+ .pr_protocol = 0,
+ .pr_flags = PR_ATOMIC | PR_ADDR,
+ .pr_output = route_output,
+ .pr_ctlinput = raw_ctlinput,
+ .pr_init = raw_init,
+ .pr_usrreqs = &route_usrreqs,
+ }
};
-static int route_proto_count = (sizeof (routesw) / sizeof (struct protosw));
+static int route_proto_count = (sizeof(routesw) / sizeof(struct protosw));
struct domain routedomain_s = {
- .dom_family = PF_ROUTE,
- .dom_name = "route",
- .dom_init = route_dinit,
+ .dom_family = PF_ROUTE,
+ .dom_name = "route",
+ .dom_init = route_dinit,
};
static void
routedomain = dp;
- for (i = 0, pr = &routesw[0]; i < route_proto_count; i++, pr++)
+ for (i = 0, pr = &routesw[0]; i < route_proto_count; i++, pr++) {
net_add_proto(pr, dp, 1);
+ }
route_init();
}
projects / apple / xnu.git / blobdiff