X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/dbf0c42388ea40e835684353b6bf13aa4b80b98b..5548a02fb5c1a0399f9e8d8d90b4a0370bea6070:/usr/src/sys/net/rtsock.c diff --git a/usr/src/sys/net/rtsock.c b/usr/src/sys/net/rtsock.c index c26af0880c..bfd5e8b0e5 100644 --- a/usr/src/sys/net/rtsock.c +++ b/usr/src/sys/net/rtsock.c @@ -1,32 +1,48 @@ /* - * Copyright (c) 1988 Regents of the University of California. + * Copyright (c) 1988, 1991 Regents of the University of California. * All rights reserved. * * %sccs.include.redist.c% * - * @(#)rtsock.c 7.12 (Berkeley) %G% + * @(#)rtsock.c 7.31 (Berkeley) %G% */ -#include "param.h" -#include "mbuf.h" -#include "user.h" -#include "proc.h" -#include "socket.h" -#include "socketvar.h" -#include "domain.h" -#include "protosw.h" -#include "errno.h" +#include +#include +#include +#include +#include +#include +#include +#include -#include "af.h" -#include "if.h" -#include "route.h" -#include "raw_cb.h" +#include +#include +#include +#include -#include "machine/mtpr.h" +struct sockaddr route_dst = { 2, PF_ROUTE, }; +struct sockaddr route_src = { 2, PF_ROUTE, }; +struct sockproto route_proto = { PF_ROUTE, }; -struct sockaddr route_dst = { 2, PF_ROUTE, }; -struct sockaddr route_src = { 2, PF_ROUTE, }; -struct sockproto route_proto = { PF_ROUTE, }; +struct walkarg { + int w_op, w_arg, w_given, w_needed, w_tmemsize; + caddr_t w_where, w_tmem; +}; + +static void rt_xaddrs __P((caddr_t, caddr_t, struct rt_addrinfo *)); +static struct mbuf *rt_msg1 __P((int, struct rt_addrinfo *)); +static int rt_msg2 __P((int, struct rt_addrinfo *, caddr_t, + struct walkarg *)); + +/* Sleazy use of local variables throughout file, warning!!!! */ +#define dst info.rti_info[RTAX_DST] +#define gate info.rti_info[RTAX_GATEWAY] +#define netmask info.rti_info[RTAX_NETMASK] +#define genmask info.rti_info[RTAX_GENMASK] +#define ifpaddr info.rti_info[RTAX_IFP] +#define ifaaddr info.rti_info[RTAX_IFA] +#define brdaddr info.rti_info[RTAX_BRD] /*ARGSUSED*/ route_usrreq(so, req, m, nam, control) @@ -36,6 +52,7 @@ route_usrreq(so, req, m, nam, control) { register int error = 0; register struct rawcb *rp = sotorawcb(so); + int s; if (req == PRU_ATTACH) { MALLOC(rp, struct rawcb *, sizeof(*rp), M_PCB, M_WAITOK); if (so->so_pcb = (caddr_t)rp) @@ -52,12 +69,14 @@ route_usrreq(so, req, m, nam, control) route_cb.iso_count--; route_cb.any_count--; } + s = splnet(); error = raw_usrreq(so, req, m, nam, control); rp = sotorawcb(so); if (req == PRU_ATTACH && rp) { int af = rp->rcb_proto.sp_protocol; if (error) { free((caddr_t)rp, M_PCB); + splx(s); return (error); } if (af == AF_INET) @@ -71,25 +90,23 @@ route_usrreq(so, req, m, nam, control) soisconnected(so); so->so_options |= SO_USELOOPBACK; } + splx(s); return (error); } -#define ROUNDUP(a) (1 + (((a) - 1) | (sizeof(long) - 1))) /*ARGSUSED*/ route_output(m, so) register struct mbuf *m; struct socket *so; { - register struct rt_msghdr *rtm; + register struct rt_msghdr *rtm = 0; register struct rtentry *rt = 0; struct rtentry *saved_nrt = 0; - struct sockaddr *dst = 0, *gate = 0, *netmask = 0, *genmask = 0; - struct sockaddr *ifpaddr = 0; - caddr_t cp, lim; + struct rt_addrinfo info; int len, error = 0; struct ifnet *ifp = 0; - struct ifaddr *ifa; - extern struct ifaddr *ifaof_ifpforaddr(), *ifa_ifwithroute(); + struct ifaddr *ifa = 0; + struct ifaddr *ifaof_ifpforaddr(), *ifa_ifwithroute(); #define senderr(e) { error = e; goto flush;} if (m == 0 || m->m_len < sizeof(long)) @@ -99,52 +116,36 @@ route_output(m, so) if ((m->m_flags & M_PKTHDR) == 0) panic("route_output"); len = m->m_pkthdr.len; - rtm = mtod(m, struct rt_msghdr *); - if (len < rtm->rtm_msglen) + if (len < sizeof(*rtm) || + len != mtod(m, struct rt_msghdr *)->rtm_msglen) { + dst = 0; senderr(EINVAL); + } R_Malloc(rtm, struct rt_msghdr *, len); - if (rtm == 0) + if (rtm == 0) { + dst = 0; senderr(ENOBUFS); + } m_copydata(m, 0, len, (caddr_t)rtm); - if (rtm->rtm_version != RTM_VERSION) + if (rtm->rtm_version != RTM_VERSION) { + dst = 0; senderr(EPROTONOSUPPORT); - rtm->rtm_pid = u.u_procp->p_pid; - lim = len + (caddr_t) rtm; - cp = (caddr_t) (rtm + 1); - if (rtm->rtm_addrs & RTA_DST) { - dst = (struct sockaddr *)cp; - cp += ROUNDUP(dst->sa_len); - } else - senderr(EINVAL); - if ((rtm->rtm_addrs & RTA_GATEWAY) && cp < lim) { - gate = (struct sockaddr *)cp; - cp += ROUNDUP(gate->sa_len); } - if ((rtm->rtm_addrs & RTA_NETMASK) && cp < lim) { - netmask = (struct sockaddr *)cp; - if (*cp) - cp += ROUNDUP(netmask->sa_len); - else - cp += sizeof(long); - - } - if ((rtm->rtm_addrs & RTA_GENMASK) && cp < lim) { + rtm->rtm_pid = curproc->p_pid; + info.rti_addrs = rtm->rtm_addrs; + rt_xaddrs((caddr_t)(rtm + 1), len + (caddr_t)rtm, &info); + if (dst == 0) + senderr(EINVAL); + if (genmask) { struct radix_node *t, *rn_addmask(); - genmask = (struct sockaddr *)cp; - if (*cp) - cp += ROUNDUP(netmask->sa_len); - else - cp += sizeof(long); t = rn_addmask(genmask, 1, 2); if (t && Bcmp(genmask, t->rn_key, *(u_char *)genmask) == 0) genmask = (struct sockaddr *)(t->rn_key); else senderr(ENOBUFS); } - if ((rtm->rtm_addrs & RTA_IFP) && cp < lim) { - ifpaddr = (struct sockaddr *)cp; - } switch (rtm->rtm_type) { + case RTM_ADD: if (gate == 0) senderr(EINVAL); @@ -169,21 +170,41 @@ route_output(m, so) rt = rtalloc1(dst, 0); if (rt == 0) senderr(ESRCH); + if (rtm->rtm_type != RTM_GET) {/* XXX: too grotty */ + struct radix_node *rn, *rn_search(); + extern struct radix_node_head *mask_rnhead; + + if (Bcmp(dst, rt_key(rt), dst->sa_len) != 0) + senderr(ESRCH); + if (netmask && (rn = rn_search(netmask, + mask_rnhead->rnh_treetop))) + netmask = (struct sockaddr *)rn->rn_key; + for (rn = rt->rt_nodes; rn; rn = rn->rn_dupedkey) + if (netmask == (struct sockaddr *)rn->rn_mask) + break; + if (rn == 0) + senderr(ETOOMANYREFS); + rt = (struct rtentry *)rn; + } switch(rtm->rtm_type) { - struct sockaddr *outmask; case RTM_GET: + dst = rt_key(rt); + gate = rt->rt_gateway; netmask = rt_mask(rt); - len = sizeof(*rtm) + ROUNDUP(rt_key(rt)->sa_len); - rtm->rtm_addrs = RTA_DST; - if (rt->rt_gateway) { - len += ROUNDUP(rt->rt_gateway->sa_len); - rtm->rtm_addrs |= RTA_GATEWAY; - } - if (netmask) { - len += netmask->sa_len; - rtm->rtm_addrs |= RTA_NETMASK; + genmask = rt->rt_genmask; + if (rtm->rtm_addrs & (RTA_IFP | RTA_IFA)) { + if (ifp = rt->rt_ifp) { + ifpaddr = ifp->if_addrlist->ifa_addr; + ifaaddr = rt->rt_ifa->ifa_addr; + rtm->rtm_index = ifp->if_index; + } else { + ifpaddr = 0; + ifaaddr = 0; + } } + len = rt_msg2(RTM_GET, &info, (caddr_t)0, + (struct walkarg *)0); if (len > rtm->rtm_msglen) { struct rt_msghdr *new_rtm; R_Malloc(new_rtm, struct rt_msghdr *, len); @@ -191,51 +212,39 @@ route_output(m, so) senderr(ENOBUFS); Bcopy(rtm, new_rtm, rtm->rtm_msglen); Free(rtm); rtm = new_rtm; - gate = (struct sockaddr *) - (ROUNDUP(rt->rt_gateway->sa_len) - + (char *)dst); - Bcopy(&rt->rt_gateway, gate, - rt->rt_gateway->sa_len); - rtm->rtm_flags = rt->rt_flags; - if (netmask) { - outmask = (struct sockaddr *) - (ROUNDUP(netmask->sa_len)+(char *)gate); - Bcopy(netmask, outmask, netmask->sa_len); - } } + (void)rt_msg2(RTM_GET, &info, (caddr_t)rtm, + (struct walkarg *)0); + rtm->rtm_flags = rt->rt_flags; + rtm->rtm_rmx = rt->rt_rmx; break; case RTM_CHANGE: - if (gate == 0 || netmask != 0) - senderr(EINVAL); - if (gate->sa_len > (len = rt->rt_gateway->sa_len)) + if (gate && rt_setgate(rt, rt_key(rt), gate)) senderr(EDQUOT); - if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest) - rt->rt_ifa->ifa_rtrequest(RTM_DELETE, rt, gate); /* new gateway could require new ifaddr, ifp; flags may also be different; ifp may be specified by ll sockaddr when protocol address is ambiguous */ - if (ifpaddr && - (ifa = ifa_ifwithnet(ifpaddr)) && - (ifp = ifa->ifa_ifp) && - (ifa = ifaof_ifpforaddr(gate, ifp))) { - /* We got it */ - } else { - ifa = 0; ifp = 0; - } - Bcopy(gate, rt->rt_gateway, len); - rt->rt_gateway->sa_len = len; - rt_setmetrics(rtm->rtm_inits, - &rtm->rtm_rmx, &rt->rt_rmx); - if (ifa == 0) - ifa = ifa_ifwithroute(rt->rt_flags, rt_key(rt), - gate); + if (ifpaddr && (ifa = ifa_ifwithnet(ifpaddr)) && + (ifp = ifa->ifa_ifp)) + ifa = ifaof_ifpforaddr(ifaaddr ? ifaaddr : gate, + ifp); + else if ((ifaaddr && (ifa = ifa_ifwithaddr(ifaaddr))) || + (ifa = ifa_ifwithroute(rt->rt_flags, + rt_key(rt), gate))) + ifp = ifa->ifa_ifp; if (ifa) { - if (rt->rt_ifa != ifa) { + register struct ifaddr *oifa = rt->rt_ifa; + if (oifa != ifa) { + if (oifa && oifa->ifa_rtrequest) + oifa->ifa_rtrequest(RTM_DELETE, + rt, gate); rt->rt_ifa = ifa; - rt->rt_ifp = ifa->ifa_ifp; + rt->rt_ifp = ifp; } } + rt_setmetrics(rtm->rtm_inits, &rtm->rtm_rmx, + &rt->rt_rmx); if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest) rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, gate); if (genmask) @@ -244,12 +253,12 @@ route_output(m, so) * Fall into */ case RTM_LOCK: + rt->rt_rmx.rmx_locks &= ~(rtm->rtm_inits); rt->rt_rmx.rmx_locks |= (rtm->rtm_inits & rtm->rtm_rmx.rmx_locks); - rt->rt_rmx.rmx_locks &= ~(rtm->rtm_inits); break; } - goto cleanup; + break; default: senderr(EOPNOTSUPP); @@ -280,13 +289,14 @@ cleanup: /* There is another listener, so construct message */ rp = sotorawcb(so); } - if (cp = (caddr_t)rtm) { - m_copyback(m, 0, len, cp); + if (rtm) { + m_copyback(m, 0, rtm->rtm_msglen, (caddr_t)rtm); Free(rtm); } if (rp) rp->rcb_proto.sp_family = 0; /* Avoid us */ - route_proto.sp_protocol = dst->sa_family; + if (dst) + route_proto.sp_protocol = dst->sa_family; raw_input(m, &route_proto, &route_src, &route_dst); if (rp) rp->rcb_proto.sp_family = PF_ROUTE; @@ -306,9 +316,31 @@ rt_setmetrics(which, in, out) metric(RTV_RTTVAR, rmx_rttvar); metric(RTV_HOPCOUNT, rmx_hopcount); metric(RTV_MTU, rmx_mtu); + metric(RTV_EXPIRE, rmx_expire); #undef metric } +#define ROUNDUP(a) \ + ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) +#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) + +static void +rt_xaddrs(cp, cplim, rtinfo) + register caddr_t cp, cplim; + register struct rt_addrinfo *rtinfo; +{ + register struct sockaddr *sa; + register int i; + + bzero(rtinfo->rti_info, sizeof(rtinfo->rti_info)); + for (i = 0; (i < RTAX_MAX) && (cp < cplim); i++) { + if ((rtinfo->rti_addrs & (1 << i)) == 0) + continue; + rtinfo->rti_info[i] = sa = (struct sockaddr *)cp; + ADVANCE(cp, sa); + } +} + /* * Copy data from a buffer back into the indicated mbuf chain, * starting "off" bytes from the beginning, extending the mbuf @@ -327,7 +359,7 @@ m_copyback(m0, off, len, cp) if (m0 == 0) return; - while (off >= (mlen = m->m_len)) { + while (off > (mlen = m->m_len)) { off -= mlen; totlen += mlen; if (m->m_next == 0) { @@ -362,79 +394,247 @@ out: if (((m = m0)->m_flags & M_PKTHDR) && (m->m_pkthdr.len < totlen)) m->m_pkthdr.len = totlen; } -/* - * The miss message and losing message are very similar. - */ - -rt_missmsg(type, dst, gate, mask, src, flags, error) -register struct sockaddr *dst; -struct sockaddr *gate, *mask, *src; +static struct mbuf * +rt_msg1(type, rtinfo) + int type; + register struct rt_addrinfo *rtinfo; { register struct rt_msghdr *rtm; register struct mbuf *m; - int dlen = ROUNDUP(dst->sa_len); - int len = dlen + sizeof(*rtm); + register int i; + register struct sockaddr *sa; + int len, dlen; - if (route_cb.any_count == 0) - return; m = m_gethdr(M_DONTWAIT, MT_DATA); if (m == 0) - return; - m->m_pkthdr.len = m->m_len = min(len, MHLEN); + return (m); + switch (type) { + + case RTM_DELADDR: + case RTM_NEWADDR: + len = sizeof(struct ifa_msghdr); + break; + + case RTM_IFINFO: + len = sizeof(struct if_msghdr); + break; + + default: + len = sizeof(struct rt_msghdr); + } + if (len > MHLEN) + panic("rt_msg1"); + m->m_pkthdr.len = m->m_len = len; m->m_pkthdr.rcvif = 0; rtm = mtod(m, struct rt_msghdr *); - bzero((caddr_t)rtm, sizeof(*rtm)); /*XXX assumes sizeof(*rtm) < MHLEN*/ - rtm->rtm_flags = RTF_DONE | flags; + bzero((caddr_t)rtm, len); + for (i = 0; i < RTAX_MAX; i++) { + if ((sa = rtinfo->rti_info[i]) == NULL) + continue; + rtinfo->rti_addrs |= (1 << i); + dlen = ROUNDUP(sa->sa_len); + m_copyback(m, len, dlen, (caddr_t)sa); + len += dlen; + } + if (m->m_pkthdr.len != len) { + m_freem(m); + return (NULL); + } rtm->rtm_msglen = len; rtm->rtm_version = RTM_VERSION; rtm->rtm_type = type; - rtm->rtm_addrs = RTA_DST; - if (type == RTM_OLDADD || type == RTM_OLDDEL) { - rtm->rtm_pid = u.u_procp->p_pid; + return (m); +} + +static int +rt_msg2(type, rtinfo, cp, w) + int type; + register struct rt_addrinfo *rtinfo; + caddr_t cp; + struct walkarg *w; +{ + register int i; + int len, dlen, second_time = 0; + caddr_t cp0; + + rtinfo->rti_addrs = 0; +again: + switch (type) { + + case RTM_DELADDR: + case RTM_NEWADDR: + len = sizeof(struct ifa_msghdr); + break; + + case RTM_IFINFO: + len = sizeof(struct if_msghdr); + break; + + default: + len = sizeof(struct rt_msghdr); } - m_copyback(m, sizeof (*rtm), dlen, (caddr_t)dst); - if (gate) { - dlen = ROUNDUP(gate->sa_len); - m_copyback(m, len , dlen, (caddr_t)gate); + if (cp0 = cp) + cp += len; + for (i = 0; i < RTAX_MAX; i++) { + register struct sockaddr *sa; + + if ((sa = rtinfo->rti_info[i]) == 0) + continue; + rtinfo->rti_addrs |= (1 << i); + dlen = ROUNDUP(sa->sa_len); + if (cp) { + bcopy((caddr_t)sa, cp, (unsigned)dlen); + cp += dlen; + } len += dlen; - rtm->rtm_addrs |= RTA_GATEWAY; } - if (mask) { - if (mask->sa_len) - dlen = ROUNDUP(mask->sa_len); - else - dlen = sizeof(long); - m_copyback(m, len , dlen, (caddr_t)mask); - len += dlen; - rtm->rtm_addrs |= RTA_NETMASK; + if (cp == 0 && w != NULL && !second_time) { + register struct walkarg *rw = w; + + rw->w_needed += len; + if (rw->w_needed <= 0 && rw->w_where) { + if (rw->w_tmemsize < len) { + if (rw->w_tmem) + free(rw->w_tmem, M_RTABLE); + if (rw->w_tmem = (caddr_t) + malloc(len, M_RTABLE, M_NOWAIT)) + rw->w_tmemsize = len; + } + if (rw->w_tmem) { + cp = rw->w_tmem; + second_time = 1; + goto again; + } else + rw->w_where = 0; + } } - if (src) { - dlen = ROUNDUP(src->sa_len); - m_copyback(m, len , dlen, (caddr_t)src); - len += dlen; - rtm->rtm_addrs |= RTA_AUTHOR; + if (cp) { + register struct rt_msghdr *rtm = (struct rt_msghdr *)cp0; + + rtm->rtm_version = RTM_VERSION; + rtm->rtm_type = type; + rtm->rtm_msglen = len; } - if (m->m_pkthdr.len != len) { - m_freem(m); + return (len); +} + +/* + * This routine is called to generate a message from the routing + * socket indicating that a redirect has occured, a routing lookup + * has failed, or that a protocol has detected timeouts to a particular + * destination. + */ +rt_missmsg(type, rtinfo, flags, error) + int type, flags, error; + register struct rt_addrinfo *rtinfo; +{ + register struct rt_msghdr *rtm; + register struct mbuf *m; + register int i; + struct sockaddr *sa = rtinfo->rti_info[RTAX_DST]; + + if (route_cb.any_count == 0) return; - } + m = rt_msg1(type, rtinfo); + if (m == 0) + return; + rtm = mtod(m, struct rt_msghdr *); + rtm->rtm_flags = RTF_DONE | flags; rtm->rtm_errno = error; - rtm->rtm_msglen = len; - route_proto.sp_protocol = dst->sa_family; + rtm->rtm_addrs = rtinfo->rti_addrs; + route_proto.sp_protocol = sa ? sa->sa_family : 0; raw_input(m, &route_proto, &route_src, &route_dst); } -#include "kinfo.h" -struct walkarg { - int w_op, w_arg; - int w_given, w_needed; - caddr_t w_where; - struct { - struct rt_msghdr m_rtm; - char m_sabuf[128]; - } w_m; -#define w_rtm w_m.m_rtm -}; +/* + * This routine is called to generate a message from the routing + * socket indicating that the status of a network interface has changed. + */ +rt_ifmsg(ifp) + register struct ifnet *ifp; +{ + register struct if_msghdr *ifm; + struct mbuf *m; + struct rt_addrinfo info; + + if (route_cb.any_count == 0) + return; + bzero((caddr_t)&info, sizeof(info)); + m = rt_msg1(RTM_IFINFO, &info); + if (m == 0) + return; + ifm = mtod(m, struct if_msghdr *); + ifm->ifm_index = ifp->if_index; + ifm->ifm_flags = ifp->if_flags; + ifm->ifm_data = ifp->if_data; + ifm->ifm_addrs = 0; + route_proto.sp_protocol = 0; + raw_input(m, &route_proto, &route_src, &route_dst); +} + +/* + * This is called to generate messages from the routing socket + * indicating a network interface has had addresses associated with it. + * if we ever reverse the logic and replace messages TO the routing + * socket indicate a request to configure interfaces, then it will + * be unnecessary as the routing socket will automatically generate + * copies of it. + */ +rt_newaddrmsg(cmd, ifa, error, rt) + int cmd, error; + register struct ifaddr *ifa; + register struct rtentry *rt; +{ + struct rt_addrinfo info; + struct sockaddr *sa; + int pass; + struct mbuf *m; + struct ifnet *ifp = ifa->ifa_ifp; + + if (route_cb.any_count == 0) + return; + for (pass = 1; pass < 3; pass++) { + bzero((caddr_t)&info, sizeof(info)); + if ((cmd == RTM_ADD && pass == 1) || + (cmd == RTM_DELETE && pass == 2)) { + register struct ifa_msghdr *ifam; + int ncmd = cmd == RTM_ADD ? RTM_NEWADDR : RTM_DELADDR; + + ifaaddr = sa = ifa->ifa_addr; + ifpaddr = ifp->if_addrlist->ifa_addr; + netmask = ifa->ifa_netmask; + brdaddr = ifa->ifa_dstaddr; + if ((m = rt_msg1(ncmd, &info)) == NULL) + continue; + ifam = mtod(m, struct ifa_msghdr *); + ifam->ifam_index = ifp->if_index; + ifam->ifam_metric = ifa->ifa_metric; + ifam->ifam_flags = ifa->ifa_flags; + ifam->ifam_addrs = info.rti_addrs; + } + if ((cmd == RTM_ADD && pass == 2) || + (cmd == RTM_DELETE && pass == 1)) { + register struct rt_msghdr *rtm; + + if (rt == 0) + continue; + netmask = rt_mask(rt); + dst = sa = rt_key(rt); + gate = rt->rt_gateway; + 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; + rtm->rtm_errno = error; + rtm->rtm_addrs = info.rti_addrs; + } + route_proto.sp_protocol = sa ? sa->sa_family : 0; + raw_input(m, &route_proto, &route_src, &route_dst); + } +} + +#include /* * This is used in dumping the kernel table via getkinfo(). */ @@ -443,67 +643,88 @@ rt_dumpentry(rn, w) register struct walkarg *w; { register struct sockaddr *sa; - int n, error; - - for (; rn; rn = rn->rn_dupedkey) { - int count = 0, size = sizeof(w->w_rtm); register struct rtentry *rt = (struct rtentry *)rn; + int n, error = 0, size; + struct rt_addrinfo info; - if (rn->rn_flags & RNF_ROOT) - continue; if (w->w_op == KINFO_RT_FLAGS && !(rt->rt_flags & w->w_arg)) - continue; -#define next(a, l) {size += (l); w->w_rtm.rtm_addrs |= (a); } - w->w_rtm.rtm_addrs = 0; - if (sa = rt_key(rt)) - next(RTA_DST, ROUNDUP(sa->sa_len)); - if (sa = rt->rt_gateway) - next(RTA_GATEWAY, ROUNDUP(sa->sa_len)); - if (sa = rt_mask(rt)) - next(RTA_NETMASK, - sa->sa_len ? ROUNDUP(sa->sa_len) : sizeof(long)); - if (sa = rt->rt_genmask) - next(RTA_GENMASK, ROUNDUP(sa->sa_len)); - w->w_needed += size; - if (w->w_where == NULL || w->w_needed > 0) - continue; - w->w_rtm.rtm_msglen = size; - w->w_rtm.rtm_flags = rt->rt_flags; - w->w_rtm.rtm_use = rt->rt_use; - w->w_rtm.rtm_rmx = rt->rt_rmx; - w->w_rtm.rtm_index = rt->rt_ifp->if_index; -#undef next -#define next(l) {n = (l); Bcopy(sa, cp, n); cp += n;} - if (size <= sizeof(w->w_m)) { - register caddr_t cp = (caddr_t)(w->w_m.m_sabuf); - if (sa = rt_key(rt)) - next(ROUNDUP(sa->sa_len)); - if (sa = rt->rt_gateway) - next(ROUNDUP(sa->sa_len)); - if (sa = rt_mask(rt)) - next(sa->sa_len ? ROUNDUP(sa->sa_len) : sizeof(long)); - if (sa = rt->rt_genmask) - next(ROUNDUP(sa->sa_len)); -#undef next -#define next(s, l) {n = (l); \ - if (error = copyout((caddr_t)(s), w->w_where, n)) return (error); \ - w->w_where += n;} - - next(&w->w_m, size); /* Copy rtmsg and sockaddrs back */ - continue; + return 0; + bzero((caddr_t)&info, sizeof(info)); + dst = rt_key(rt); + gate = rt->rt_gateway; + netmask = rt_mask(rt); + genmask = rt->rt_genmask; + size = rt_msg2(RTM_GET, &info, 0, w); + if (w->w_where && w->w_tmem) { + register struct rt_msghdr *rtm = (struct rt_msghdr *)w->w_tmem; + + rtm->rtm_flags = rt->rt_flags; + rtm->rtm_use = rt->rt_use; + rtm->rtm_rmx = rt->rt_rmx; + rtm->rtm_index = rt->rt_ifp->if_index; + rtm->rtm_errno = rtm->rtm_pid = rtm->rtm_seq = 0; + rtm->rtm_addrs = info.rti_addrs; + if (error = copyout((caddr_t)rtm, w->w_where, size)) + w->w_where = NULL; + else + w->w_where += size; + } + return (error); +} + +kinfo_iflist(af, w) + int af; + register struct walkarg *w; +{ + register struct ifnet *ifp; + register struct ifaddr *ifa; + struct rt_addrinfo info; + struct sockaddr *sa; + int len, error = 0; + + bzero((caddr_t)&info, sizeof(info)); + for (ifp = ifnet; ifp; ifp = ifp->if_next) { + if (w->w_arg && w->w_arg != ifp->if_index) + continue; + ifa = ifp->if_addrlist; + ifpaddr = ifa->ifa_addr; + len = rt_msg2(RTM_IFINFO, &info, (caddr_t)0, w); + ifpaddr = 0; + if (w->w_where && w->w_tmem) { + register struct if_msghdr *ifm; + + ifm = (struct if_msghdr *)w->w_tmem; + ifm->ifm_index = ifp->if_index; + ifm->ifm_flags = ifp->if_flags; + ifm->ifm_data = ifp->if_data; + ifm->ifm_addrs = info.rti_addrs; + if (error = copyout((caddr_t)ifm, w->w_where, len)) + return (error); + w->w_where += len; + } + while (ifa = ifa->ifa_next) { + if (af && af != ifa->ifa_addr->sa_family) + continue; + ifaaddr = ifa->ifa_addr; + netmask = ifa->ifa_netmask; + brdaddr = ifa->ifa_dstaddr; + len = rt_msg2(RTM_NEWADDR, &info, 0, w); + if (w->w_where && w->w_tmem) { + register struct ifa_msghdr *ifam; + + ifam = (struct ifa_msghdr *)w->w_tmem; + ifam->ifam_index = ifa->ifa_ifp->if_index; + ifam->ifam_flags = ifa->ifa_flags; + ifam->ifam_metric = ifa->ifa_metric; + ifam->ifam_addrs = info.rti_addrs; + if (error = copyout(w->w_tmem, w->w_where, len)) + return (error); + w->w_where += len; + } + } + ifaaddr = netmask = brdaddr = 0; } - next(&w->w_rtm, sizeof(w->w_rtm)); - if (sa = rt_key(rt)) - next(sa, ROUNDUP(sa->sa_len)); - if (sa = rt->rt_gateway) - next(sa, ROUNDUP(sa->sa_len)); - if (sa = rt_mask(rt)) - next(sa, sa->sa_len ? ROUNDUP(sa->sa_len) : sizeof(long)); - if (sa = rt->rt_genmask) - next(sa, ROUNDUP(sa->sa_len)); - } return (0); -#undef next } kinfo_rtable(op, where, given, arg, needed) @@ -512,68 +733,49 @@ kinfo_rtable(op, where, given, arg, needed) int *given, *needed; { register struct radix_node_head *rnh; - int s, error = 0; + int i, s, error = EINVAL; u_char af = ki_af(op); struct walkarg w; - op &= 0xffff; - if (op != KINFO_RT_DUMP && op != KINFO_RT_FLAGS) - return (EINVAL); - Bzero(&w, sizeof(w)); if ((w.w_where = where) && given) w.w_given = *given; w.w_needed = 0 - w.w_given; w.w_arg = arg; - w.w_op = op; - w.w_rtm.rtm_version = RTM_VERSION; - w.w_rtm.rtm_type = RTM_GET; + w.w_op = op = ki_op(op); s = splnet(); - for (rnh = radix_node_head; rnh; rnh = rnh->rnh_next) { - if (rnh->rnh_af == 0) - continue; - if (af && af != rnh->rnh_af) - continue; - error = rt_walk(rnh->rnh_treetop, rt_dumpentry, &w); - if (error) - break; + switch (op) { + + case KINFO_RT_DUMP: + case KINFO_RT_FLAGS: + for (i = 1; i <= AF_MAX; i++) + if ((rnh = rt_tables[i]) && (af == 0 || af == i) && + (error = rnh->rnh_walk(rnh->rnh_treetop, + rt_dumpentry, &w))) + break; + break; + + case KINFO_RT_IFLIST: + error = kinfo_iflist(af, &w); } + splx(s); + if (w.w_tmem) + free(w.w_tmem, M_RTABLE); w.w_needed += w.w_given; if (where && given) *given = w.w_where - where; else w.w_needed = (11 * w.w_needed) / 10; *needed = w.w_needed; - splx(s); return (error); } -rt_walk(rn, f, w) - register struct radix_node *rn; - register int (*f)(); - struct walkarg *w; -{ - int error; - for (;;) { - while (rn->rn_b >= 0) - rn = rn->rn_l; /* First time through node, go left */ - if (error = (*f)(rn, w)) - return (error); /* Process Leaf */ - while (rn->rn_p->rn_r == rn) { /* if coming back from right */ - rn = rn->rn_p; /* go back up */ - if (rn->rn_flags & RNF_ROOT) - return 0; - } - rn = rn->rn_p->rn_r; /* otherwise, go right*/ - } -} - /* * Definitions of protocols supported in the ROUTE domain. */ -int raw_init(),raw_usrreq(),raw_input(),raw_ctlinput(); +int raw_init(),raw_usrreq(),raw_input(),raw_ctlinput(), route_init(); extern struct domain routedomain; /* or at least forward */ struct protosw routesw[] = { @@ -587,5 +789,5 @@ struct protosw routesw[] = { int unp_externalize(), unp_dispose(); struct domain routedomain = - { PF_ROUTE, "route", 0, 0, 0, + { PF_ROUTE, "route", route_init, 0, 0, routesw, &routesw[sizeof(routesw)/sizeof(routesw[0])] };