Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet/raw_ip.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/raw_ip.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.25.4.1 retrieving revision 1.118 diff -u -p -r1.25.4.1 -r1.118 --- src/sys/netinet/raw_ip.c 1996/11/10 21:57:53 1.25.4.1 +++ src/sys/netinet/raw_ip.c 2014/02/25 18:30:12 1.118 @@ -1,4 +1,33 @@ -/* $NetBSD: raw_ip.c,v 1.25.4.1 1996/11/10 21:57:53 thorpej Exp $ */ +/* $NetBSD: raw_ip.c,v 1.118 2014/02/25 18:30:12 pooka Exp $ */ + +/* + * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ /* * Copyright (c) 1982, 1986, 1988, 1993 @@ -12,11 +41,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -32,10 +57,19 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)raw_ip.c 8.2 (Berkeley) 1/4/94 + * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 */ +#include +__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.118 2014/02/25 18:30:12 pooka Exp $"); + +#include "opt_inet.h" +#include "opt_compat_netbsd.h" +#include "opt_ipsec.h" +#include "opt_mrouting.h" + #include +#include #include #include #include @@ -43,6 +77,8 @@ #include #include #include +#include +#include #include #include @@ -51,14 +87,33 @@ #include #include #include +#include #include +#include #include +#include #include -#include +#ifdef IPSEC +#include +#include +#include +#endif /* IPSEC */ + +#ifdef COMPAT_50 +#include +#endif struct inpcbtable rawcbtable; +int rip_pcbnotify(struct inpcbtable *, struct in_addr, + struct in_addr, int, int, void (*)(struct inpcb *, int)); +int rip_bind(struct inpcb *, struct mbuf *); +int rip_connect(struct inpcb *, struct mbuf *); +void rip_disconnect(struct inpcb *); + +static void sysctl_net_inet_raw_setup(struct sysctllog **); + /* * Nominal space allocated to a raw ip socket. */ @@ -73,68 +128,173 @@ struct inpcbtable rawcbtable; * Initialize raw connection block q. */ void -rip_init() +rip_init(void) { - in_pcbinit(&rawcbtable, 1); + sysctl_net_inet_raw_setup(NULL); + in_pcbinit(&rawcbtable, 1, 1); +} + +static void +rip_sbappendaddr(struct inpcb *last, struct ip *ip, const struct sockaddr *sa, + int hlen, struct mbuf *opts, struct mbuf *n) +{ + if (last->inp_flags & INP_NOHEADER) + m_adj(n, hlen); + if (last->inp_flags & INP_CONTROLOPTS +#ifdef SO_OTIMESTAMP + || last->inp_socket->so_options & SO_OTIMESTAMP +#endif + || last->inp_socket->so_options & SO_TIMESTAMP) + ip_savecontrol(last, &opts, ip, n); + if (sbappendaddr(&last->inp_socket->so_rcv, sa, n, opts) == 0) { + /* should notify about lost packet */ + m_freem(n); + if (opts) + m_freem(opts); + } else + sorwakeup(last->inp_socket); } -struct sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET }; /* * Setup generic address and protocol structures * for raw_input routine, then pass them along with * mbuf chain. */ void -#if __STDC__ rip_input(struct mbuf *m, ...) -#else -rip_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { - register struct ip *ip = mtod(m, struct ip *); - register struct inpcb *inp; - struct socket *last = 0; - - ripsrc.sin_addr = ip->ip_src; - for (inp = rawcbtable.inpt_queue.cqh_first; - inp != (struct inpcb *)&rawcbtable.inpt_queue; - inp = inp->inp_queue.cqe_next) { - if (inp->inp_ip.ip_p && inp->inp_ip.ip_p != ip->ip_p) + int hlen, proto; + struct ip *ip = mtod(m, struct ip *); + struct inpcb_hdr *inph; + struct inpcb *inp; + struct inpcb *last = NULL; + struct mbuf *n, *opts = NULL; + struct sockaddr_in ripsrc; + va_list ap; + + va_start(ap, m); + (void)va_arg(ap, int); /* ignore value, advance ap */ + proto = va_arg(ap, int); + va_end(ap); + + sockaddr_in_init(&ripsrc, &ip->ip_src, 0); + + /* + * XXX Compatibility: programs using raw IP expect ip_len + * XXX to have the header length subtracted, and in host order. + * XXX ip_off is also expected to be host order. + */ + hlen = ip->ip_hl << 2; + ip->ip_len = ntohs(ip->ip_len) - hlen; + NTOHS(ip->ip_off); + + TAILQ_FOREACH(inph, &rawcbtable.inpt_queue, inph_queue) { + inp = (struct inpcb *)inph; + if (inp->inp_af != AF_INET) continue; - if (inp->inp_laddr.s_addr && - inp->inp_laddr.s_addr != ip->ip_dst.s_addr) + if (inp->inp_ip.ip_p && inp->inp_ip.ip_p != proto) continue; - if (inp->inp_faddr.s_addr && - inp->inp_faddr.s_addr != ip->ip_src.s_addr) + if (!in_nullhost(inp->inp_laddr) && + !in_hosteq(inp->inp_laddr, ip->ip_dst)) continue; - if (last) { - struct mbuf *n; - if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) { - if (sbappendaddr(&last->so_rcv, - sintosa(&ripsrc), n, - (struct mbuf *)0) == 0) - /* should notify about lost packet */ - m_freem(n); - else - sorwakeup(last); - } + if (!in_nullhost(inp->inp_faddr) && + !in_hosteq(inp->inp_faddr, ip->ip_src)) + continue; + if (last == NULL) + ; +#if defined(IPSEC) + /* check AH/ESP integrity. */ + else if (ipsec4_in_reject_so(m, last->inp_socket)) { + IPSEC_STATINC(IPSEC_STAT_IN_POLVIO); + /* do not inject data to pcb */ + } +#endif /*IPSEC*/ + else if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) { + rip_sbappendaddr(last, ip, sintosa(&ripsrc), hlen, opts, + n); + opts = NULL; } - last = inp->inp_socket; + last = inp; } - if (last) { - if (sbappendaddr(&last->so_rcv, sintosa(&ripsrc), m, - (struct mbuf *)0) == 0) - m_freem(m); - else - sorwakeup(last); - } else { +#if defined(IPSEC) + /* check AH/ESP integrity. */ + if (last != NULL && ipsec4_in_reject_so(m, last->inp_socket)) { + m_freem(m); + IPSEC_STATINC(IPSEC_STAT_IN_POLVIO); + IP_STATDEC(IP_STAT_DELIVERED); + /* do not inject data to pcb */ + } else +#endif /*IPSEC*/ + if (last != NULL) + rip_sbappendaddr(last, ip, sintosa(&ripsrc), hlen, opts, m); + else if (inetsw[ip_protox[ip->ip_p]].pr_input == rip_input) { + uint64_t *ips; + + icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_PROTOCOL, + 0, 0); + ips = IP_STAT_GETREF(); + ips[IP_STAT_NOPROTO]++; + ips[IP_STAT_DELIVERED]--; + IP_STAT_PUTREF(); + } else m_freem(m); - ipstat.ips_noproto++; - ipstat.ips_delivered--; + return; +} + +int +rip_pcbnotify(struct inpcbtable *table, + struct in_addr faddr, struct in_addr laddr, int proto, int errno, + void (*notify)(struct inpcb *, int)) +{ + struct inpcb_hdr *inph, *ninph; + int nmatch; + + nmatch = 0; + TAILQ_FOREACH_SAFE(inph, &table->inpt_queue, inph_queue, ninph) { + struct inpcb *inp = (struct inpcb *)inph; + if (inp->inp_af != AF_INET) + continue; + if (inp->inp_ip.ip_p && inp->inp_ip.ip_p != proto) + continue; + if (in_hosteq(inp->inp_faddr, faddr) && + in_hosteq(inp->inp_laddr, laddr)) { + (*notify)(inp, errno); + nmatch++; + } } + + return nmatch; +} + +void * +rip_ctlinput(int cmd, const struct sockaddr *sa, void *v) +{ + struct ip *ip = v; + void (*notify)(struct inpcb *, int) = in_rtchange; + int errno; + + if (sa->sa_family != AF_INET || + sa->sa_len != sizeof(struct sockaddr_in)) + return NULL; + if ((unsigned)cmd >= PRC_NCMDS) + return NULL; + errno = inetctlerrmap[cmd]; + if (PRC_IS_REDIRECT(cmd)) + notify = in_rtchange, ip = 0; + else if (cmd == PRC_HOSTDEAD) + ip = 0; + else if (errno == 0) + return NULL; + if (ip) { + rip_pcbnotify(&rawcbtable, satocsin(sa)->sin_addr, + ip->ip_src, ip->ip_p, errno, notify); + + /* XXX mapped address case */ + } else + in_pcbnotifyall(&rawcbtable, satocsin(sa)->sin_addr, errno, + notify); + return NULL; } /* @@ -142,29 +302,21 @@ rip_input(m, va_alist) * Tack on options user may have setup with control call. */ int -#if __STDC__ rip_output(struct mbuf *m, ...) -#else -rip_output(m, va_alist) - struct mbuf *m; - va_dcl -#endif { - struct socket *so; - u_long dst; - register struct ip *ip; - register struct inpcb *inp; + struct inpcb *inp; + struct ip *ip; struct mbuf *opts; int flags; va_list ap; va_start(ap, m); - so = va_arg(ap, struct socket *); - dst = va_arg(ap, u_long); + inp = va_arg(ap, struct inpcb *); va_end(ap); - inp = sotoinpcb(so); - flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST; + flags = + (inp->inp_socket->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST + | IP_RETURNMTU; /* * If the user handed us a complete IP packet, use it. @@ -175,14 +327,16 @@ rip_output(m, va_alist) m_freem(m); return (EMSGSIZE); } - M_PREPEND(m, sizeof(struct ip), M_WAIT); + M_PREPEND(m, sizeof(struct ip), M_DONTWAIT); + if (!m) + return (ENOBUFS); ip = mtod(m, struct ip *); ip->ip_tos = 0; - ip->ip_off = 0; + ip->ip_off = htons(0); ip->ip_p = inp->inp_ip.ip_p; - ip->ip_len = m->m_pkthdr.len; + ip->ip_len = htons(m->m_pkthdr.len); ip->ip_src = inp->inp_laddr; - ip->ip_dst.s_addr = dst; + ip->ip_dst = inp->inp_faddr; ip->ip_ttl = MAXTTL; opts = inp->inp_options; } else { @@ -191,85 +345,166 @@ rip_output(m, va_alist) return (EMSGSIZE); } ip = mtod(m, struct ip *); - if (ip->ip_id == 0) - ip->ip_id = htons(ip_id++); + + /* + * If the mbuf is read-only, we need to allocate + * a new mbuf for the header, since we need to + * modify the header. + */ + if (M_READONLY(m)) { + int hlen = ip->ip_hl << 2; + + m = m_copyup(m, hlen, (max_linkhdr + 3) & ~3); + if (m == NULL) + return (ENOMEM); /* XXX */ + ip = mtod(m, struct ip *); + } + + /* XXX userland passes ip_len and ip_off in host order */ + if (m->m_pkthdr.len != ip->ip_len) { + m_freem(m); + return (EINVAL); + } + HTONS(ip->ip_len); + HTONS(ip->ip_off); + if (ip->ip_id != 0 || m->m_pkthdr.len < IP_MINFRAGSIZE) + flags |= IP_NOIPNEWID; opts = NULL; /* XXX prevent ip_output from overwriting header fields */ flags |= IP_RAWOUTPUT; - ipstat.ips_rawout++; + IP_STATINC(IP_STAT_RAWOUT); } - return (ip_output(m, opts, &inp->inp_route, flags, inp->inp_moptions)); + return (ip_output(m, opts, &inp->inp_route, flags, inp->inp_moptions, + inp->inp_socket, &inp->inp_errormtu)); } /* * Raw IP socket option processing. */ int -rip_ctloutput(op, so, level, optname, m) - int op; - struct socket *so; - int level, optname; - struct mbuf **m; +rip_ctloutput(int op, struct socket *so, struct sockopt *sopt) { - register struct inpcb *inp = sotoinpcb(so); + struct inpcb *inp = sotoinpcb(so); + int error = 0; + int optval; + + if (sopt->sopt_level == SOL_SOCKET && sopt->sopt_name == SO_NOHEADER) { + if (op == PRCO_GETOPT) { + optval = (inp->inp_flags & INP_NOHEADER) ? 1 : 0; + error = sockopt_set(sopt, &optval, sizeof(optval)); + } else if (op == PRCO_SETOPT) { + error = sockopt_getint(sopt, &optval); + if (error) + goto out; + if (optval) { + inp->inp_flags &= ~INP_HDRINCL; + inp->inp_flags |= INP_NOHEADER; + } else + inp->inp_flags &= ~INP_NOHEADER; + } + goto out; + } else if (sopt->sopt_level != IPPROTO_IP) + return ip_ctloutput(op, so, sopt); + + switch (op) { + + case PRCO_SETOPT: + switch (sopt->sopt_name) { + case IP_HDRINCL: + error = sockopt_getint(sopt, &optval); + if (error) + break; + if (optval) + inp->inp_flags |= INP_HDRINCL; + else + inp->inp_flags &= ~INP_HDRINCL; + break; + #ifdef MROUTING - int error; + case MRT_INIT: + case MRT_DONE: + case MRT_ADD_VIF: + case MRT_DEL_VIF: + case MRT_ADD_MFC: + case MRT_DEL_MFC: + case MRT_ASSERT: + case MRT_API_CONFIG: + case MRT_ADD_BW_UPCALL: + case MRT_DEL_BW_UPCALL: + error = ip_mrouter_set(so, sopt); + break; #endif - if (level != IPPROTO_IP) { - if (m != 0 && *m != 0) - (void)m_free(*m); - return (EINVAL); - } - - switch (optname) { - - case IP_HDRINCL: - if (op == PRCO_SETOPT || op == PRCO_GETOPT) { - if (m == 0 || *m == 0 || (*m)->m_len < sizeof (int)) - return (EINVAL); - if (op == PRCO_SETOPT) { - if (*mtod(*m, int *)) - inp->inp_flags |= INP_HDRINCL; - else - inp->inp_flags &= ~INP_HDRINCL; - (void)m_free(*m); - } else { - (*m)->m_len = sizeof (int); - *mtod(*m, int *) = inp->inp_flags & INP_HDRINCL; - } - return (0); + default: + error = ip_ctloutput(op, so, sopt); + break; } break; - case MRT_INIT: - case MRT_DONE: - case MRT_ADD_VIF: - case MRT_DEL_VIF: - case MRT_ADD_MFC: - case MRT_DEL_MFC: - case MRT_VERSION: - case MRT_ASSERT: -#ifdef MROUTING - switch (op) { - case PRCO_SETOPT: - error = ip_mrouter_set(optname, so, m); + case PRCO_GETOPT: + switch (sopt->sopt_name) { + case IP_HDRINCL: + optval = inp->inp_flags & INP_HDRINCL; + error = sockopt_set(sopt, &optval, sizeof(optval)); break; - case PRCO_GETOPT: - error = ip_mrouter_get(optname, so, m); + +#ifdef MROUTING + case MRT_VERSION: + case MRT_ASSERT: + case MRT_API_SUPPORT: + case MRT_API_CONFIG: + error = ip_mrouter_get(so, sopt); break; +#endif + default: - error = EINVAL; + error = ip_ctloutput(op, so, sopt); break; } - return (error); -#else - if (op == PRCO_SETOPT && *m) - m_free(*m); - return (EOPNOTSUPP); -#endif + break; } - return (ip_ctloutput(op, so, level, optname, m)); + out: + return error; +} + +int +rip_bind(struct inpcb *inp, struct mbuf *nam) +{ + struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *); + + if (nam->m_len != sizeof(*addr)) + return (EINVAL); + if (TAILQ_FIRST(&ifnet) == 0) + return (EADDRNOTAVAIL); + if (addr->sin_family != AF_INET) + return (EAFNOSUPPORT); + if (!in_nullhost(addr->sin_addr) && + ifa_ifwithaddr(sintosa(addr)) == 0) + return (EADDRNOTAVAIL); + inp->inp_laddr = addr->sin_addr; + return (0); +} + +int +rip_connect(struct inpcb *inp, struct mbuf *nam) +{ + struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *); + + if (nam->m_len != sizeof(*addr)) + return (EINVAL); + if (TAILQ_FIRST(&ifnet) == 0) + return (EADDRNOTAVAIL); + if (addr->sin_family != AF_INET) + return (EAFNOSUPPORT); + inp->inp_faddr = addr->sin_addr; + return (0); +} + +void +rip_disconnect(struct inpcb *inp) +{ + + inp->inp_faddr = zeroin_addr; } u_long rip_sendspace = RIPSNDQ; @@ -277,20 +512,36 @@ u_long rip_recvspace = RIPRCVQ; /*ARGSUSED*/ int -rip_usrreq(so, req, m, nam, control) - register struct socket *so; - int req; - struct mbuf *m, *nam, *control; +rip_usrreq(struct socket *so, int req, + struct mbuf *m, struct mbuf *nam, struct mbuf *control, struct lwp *l) { - register int error = 0; - register struct inpcb *inp = sotoinpcb(so); + struct inpcb *inp; + int s; + int error = 0; #ifdef MROUTING extern struct socket *ip_mrouter; #endif + if (req == PRU_CONTROL) - return (in_control(so, (long)m, (caddr_t)nam, - (struct ifnet *)control)); + return in_control(so, (long)m, nam, (struct ifnet *)control, l); + s = splsoftnet(); + + if (req == PRU_PURGEIF) { + mutex_enter(softnet_lock); + in_pcbpurgeif0(&rawcbtable, (struct ifnet *)control); + in_purgeif((struct ifnet *)control); + in_pcbpurgeif(&rawcbtable, (struct ifnet *)control); + mutex_exit(softnet_lock); + splx(s); + return (0); + } + + inp = sotoinpcb(so); +#ifdef DIAGNOSTIC + if (req != PRU_SEND && req != PRU_SENDOOB && control) + panic("rip_usrreq: unexpected control mbuf"); +#endif if (inp == NULL && req != PRU_ATTACH) { error = EINVAL; goto release; @@ -299,31 +550,32 @@ rip_usrreq(so, req, m, nam, control) switch (req) { case PRU_ATTACH: - if (inp) - panic("rip_attach"); - if ((so->so_state & SS_PRIV) == 0) { + sosetlock(so); + if (inp != 0) { + error = EISCONN; + break; + } + + if (l == NULL) { error = EACCES; break; } - if ((error = soreserve(so, rip_sendspace, rip_recvspace)) || - (error = in_pcballoc(so, &rawcbtable))) + + /* XXX: raw socket permissions are checked in socreate() */ + + if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { + error = soreserve(so, rip_sendspace, rip_recvspace); + if (error) + break; + } + error = in_pcballoc(so, &rawcbtable); + if (error) break; - inp = (struct inpcb *)so->so_pcb; + inp = sotoinpcb(so); inp->inp_ip.ip_p = (long)nam; break; - case PRU_DISCONNECT: - if ((so->so_state & SS_ISCONNECTED) == 0) { - error = ENOTCONN; - break; - } - /* FALLTHROUGH */ - case PRU_ABORT: - soisdisconnected(so); - /* FALLTHROUGH */ case PRU_DETACH: - if (inp == 0) - panic("rip_detach"); #ifdef MROUTING if (so == ip_mrouter) ip_mrouter_done(); @@ -332,50 +584,29 @@ rip_usrreq(so, req, m, nam, control) break; case PRU_BIND: - { - struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *); + error = rip_bind(inp, nam); + break; - if (nam->m_len != sizeof(*addr)) { - error = EINVAL; - break; - } - if ((ifnet.tqh_first == 0) || - ((addr->sin_family != AF_INET) && - (addr->sin_family != AF_IMPLINK)) || - (addr->sin_addr.s_addr && - ifa_ifwithaddr(sintosa(addr)) == 0)) { - error = EADDRNOTAVAIL; - break; - } - inp->inp_laddr = addr->sin_addr; + case PRU_LISTEN: + error = EOPNOTSUPP; break; - } - case PRU_CONNECT: - { - struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *); - if (nam->m_len != sizeof(*addr)) { - error = EINVAL; - break; - } - if (ifnet.tqh_first == 0) { - error = EADDRNOTAVAIL; - break; - } - if ((addr->sin_family != AF_INET) && - (addr->sin_family != AF_IMPLINK)) { - error = EAFNOSUPPORT; + case PRU_CONNECT: + error = rip_connect(inp, nam); + if (error) break; - } - inp->inp_faddr = addr->sin_addr; soisconnected(so); break; - } case PRU_CONNECT2: error = EOPNOTSUPP; break; + case PRU_DISCONNECT: + soisdisconnected(so); + rip_disconnect(inp); + break; + /* * Mark the connection as being incapable of further input. */ @@ -383,46 +614,59 @@ rip_usrreq(so, req, m, nam, control) socantsendmore(so); break; + case PRU_RCVD: + error = EOPNOTSUPP; + break; + /* * Ship a packet out. The appropriate raw output * routine handles any massaging necessary. */ case PRU_SEND: - { - register u_int32_t dst; - - if (so->so_state & SS_ISCONNECTED) { - if (nam) { + if (control && control->m_len) { + m_freem(control); + m_freem(m); + error = EINVAL; + break; + } + { + if (nam) { + if ((so->so_state & SS_ISCONNECTED) != 0) { error = EISCONN; + goto die; + } + error = rip_connect(inp, nam); + if (error) { + die: + m_freem(m); break; } - dst = inp->inp_faddr.s_addr; } else { - if (nam == NULL) { + if ((so->so_state & SS_ISCONNECTED) == 0) { error = ENOTCONN; - break; + goto die; } - dst = mtod(nam, struct sockaddr_in *)->sin_addr.s_addr; } - error = rip_output(m, so, dst); - m = NULL; + error = rip_output(m, inp); + if (nam) + rip_disconnect(inp); + } break; - } case PRU_SENSE: /* * stat: don't bother with a blocksize. */ + splx(s); return (0); - /* - * Not supported. - */ case PRU_RCVOOB: - case PRU_RCVD: - case PRU_LISTEN: - case PRU_ACCEPT: + error = EOPNOTSUPP; + break; + case PRU_SENDOOB: + m_freem(control); + m_freem(m); error = EOPNOTSUPP; break; @@ -437,8 +681,33 @@ rip_usrreq(so, req, m, nam, control) default: panic("rip_usrreq"); } + release: - if (m != NULL) - m_freem(m); + splx(s); return (error); } + +static void +sysctl_net_inet_raw_setup(struct sysctllog **clog) +{ + + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "inet", NULL, + NULL, 0, NULL, 0, + CTL_NET, PF_INET, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "raw", + SYSCTL_DESCR("Raw IPv4 settings"), + NULL, 0, NULL, 0, + CTL_NET, PF_INET, IPPROTO_RAW, CTL_EOL); + + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_STRUCT, "pcblist", + SYSCTL_DESCR("Raw IPv4 control block list"), + sysctl_inpcblist, 0, &rawcbtable, 0, + CTL_NET, PF_INET, IPPROTO_RAW, + CTL_CREATE, CTL_EOL); +}