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.88.4.2 retrieving revision 1.161 diff -u -p -r1.88.4.2 -r1.161 --- src/sys/netinet/raw_ip.c 2006/09/09 02:58:47 1.88.4.2 +++ src/sys/netinet/raw_ip.c 2016/09/29 12:19:47 1.161 @@ -1,4 +1,4 @@ -/* $NetBSD: raw_ip.c,v 1.88.4.2 2006/09/09 02:58:47 rpaulo Exp $ */ +/* $NetBSD: raw_ip.c,v 1.161 2016/09/29 12:19:47 roy Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -60,16 +60,22 @@ * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 */ +/* + * Raw interface to IP protocol. + */ + #include -__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.88.4.2 2006/09/09 02:58:47 rpaulo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.161 2016/09/29 12:19:47 roy Exp $"); +#ifdef _KERNEL_OPT #include "opt_inet.h" +#include "opt_compat_netbsd.h" #include "opt_ipsec.h" #include "opt_mrouting.h" +#endif #include #include -#include #include #include #include @@ -80,36 +86,36 @@ __KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1 #include #include -#include #include #include #include #include +#include #include #include #include #include #include -#include - #ifdef IPSEC -#include -#endif /*IPSEC*/ - -#ifdef FAST_IPSEC #include -#include /* XXX ipsecstat namespace */ -#endif /* FAST_IPSEC*/ +#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 int rip_connect_pcb(struct inpcb *, struct sockaddr_in *); +static void rip_disconnect1(struct inpcb *); + +static void sysctl_net_inet_raw_setup(struct sysctllog **); /* * Nominal space allocated to a raw ip socket. @@ -117,6 +123,9 @@ void rip_disconnect(struct inpcb *); #define RIPSNDQ 8192 #define RIPRCVQ 8192 +static u_long rip_sendspace = RIPSNDQ; +static u_long rip_recvspace = RIPRCVQ; + /* * Raw interface to IP protocol. */ @@ -128,9 +137,31 @@ void rip_init(void) { + 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); +} + /* * Setup generic address and protocol structures * for raw_input routine, then pass them along with @@ -139,11 +170,12 @@ rip_init(void) void rip_input(struct mbuf *m, ...) { - int proto; + int hlen, proto; struct ip *ip = mtod(m, struct ip *); + struct inpcb_hdr *inph; struct inpcb *inp; - struct inpcb *last = 0; - struct mbuf *opts = 0; + struct inpcb *last = NULL; + struct mbuf *n, *opts = NULL; struct sockaddr_in ripsrc; va_list ap; @@ -152,21 +184,19 @@ rip_input(struct mbuf *m, ...) proto = va_arg(ap, int); va_end(ap); - ripsrc.sin_family = AF_INET; - ripsrc.sin_len = sizeof(struct sockaddr_in); - ripsrc.sin_addr = ip->ip_src; - ripsrc.sin_port = 0; - bzero((caddr_t)ripsrc.sin_zero, sizeof(ripsrc.sin_zero)); + 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. */ - ip->ip_len = ntohs(ip->ip_len) - (ip->ip_hl << 2); + hlen = ip->ip_hl << 2; + ip->ip_len = ntohs(ip->ip_len) - hlen; NTOHS(ip->ip_off); - CIRCLEQ_FOREACH(inp, &rawcbtable.inpt_queue, inp_queue) { + TAILQ_FOREACH(inph, &rawcbtable.inpt_queue, inph_queue) { + inp = (struct inpcb *)inph; if (inp->inp_af != AF_INET) continue; if (inp->inp_ip.ip_p && inp->inp_ip.ip_p != proto) @@ -177,62 +207,46 @@ rip_input(struct mbuf *m, ...) if (!in_nullhost(inp->inp_faddr) && !in_hosteq(inp->inp_faddr, ip->ip_src)) continue; - if (last) { - struct mbuf *n; - -#if defined(IPSEC) || defined(FAST_IPSEC) - /* check AH/ESP integrity. */ - if (ipsec4_in_reject_so(m, last->inp_socket)) { - ipsecstat.in_polvio++; - /* do not inject data to pcb */ - } else + if (last == NULL) + ; +#if defined(IPSEC) + /* check AH/ESP integrity. */ + else if (ipsec_used && + ipsec4_in_reject_so(m, last->inp_socket)) { + IPSEC_STATINC(IPSEC_STAT_IN_POLVIO); + /* do not inject data to pcb */ + } #endif /*IPSEC*/ - if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) { - if (last->inp_flags & INP_CONTROLOPTS || - last->inp_socket->so_options & SO_TIMESTAMP) - ip_savecontrol(last, &opts, ip, n); - if (sbappendaddr(&last->inp_socket->so_rcv, - sintosa(&ripsrc), n, opts) == 0) { - /* should notify about lost packet */ - m_freem(n); - if (opts) - m_freem(opts); - } else - sorwakeup(last->inp_socket); - opts = NULL; - } + else if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) { + rip_sbappendaddr(last, ip, sintosa(&ripsrc), hlen, opts, + n); + opts = NULL; } last = inp; } -#if defined(IPSEC) || defined(FAST_IPSEC) +#if defined(IPSEC) /* check AH/ESP integrity. */ - if (last && ipsec4_in_reject_so(m, last->inp_socket)) { + if (ipsec_used && last != NULL + && ipsec4_in_reject_so(m, last->inp_socket)) { m_freem(m); - ipsecstat.in_polvio++; - ipstat.ips_delivered--; + IPSEC_STATINC(IPSEC_STAT_IN_POLVIO); + IP_STATDEC(IP_STAT_DELIVERED); /* do not inject data to pcb */ } else #endif /*IPSEC*/ - if (last) { - if (last->inp_flags & INP_CONTROLOPTS || - last->inp_socket->so_options & SO_TIMESTAMP) - ip_savecontrol(last, &opts, ip, m); - if (sbappendaddr(&last->inp_socket->so_rcv, - sintosa(&ripsrc), m, opts) == 0) { - m_freem(m); - if (opts) - m_freem(opts); - } else - sorwakeup(last->inp_socket); - } else { - if (inetsw[ip_protox[ip->ip_p]].pr_input == rip_input) { - icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_PROTOCOL, - 0, 0); - ipstat.ips_noproto++; - ipstat.ips_delivered--; - } else - m_freem(m); - } + 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); return; } @@ -241,14 +255,12 @@ rip_pcbnotify(struct inpcbtable *table, struct in_addr faddr, struct in_addr laddr, int proto, int errno, void (*notify)(struct inpcb *, int)) { - struct inpcb *inp, *ninp; + struct inpcb_hdr *inph, *ninph; int nmatch; nmatch = 0; - for (inp = (struct inpcb *)CIRCLEQ_FIRST(&table->inpt_queue); - inp != (struct inpcb *)&table->inpt_queue; - inp = ninp) { - ninp = (struct inpcb *)inp->inp_queue.cqe_next; + 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) @@ -264,7 +276,7 @@ rip_pcbnotify(struct inpcbtable *table, } void * -rip_ctlinput(int cmd, struct sockaddr *sa, void *v) +rip_ctlinput(int cmd, const struct sockaddr *sa, void *v) { struct ip *ip = v; void (*notify)(struct inpcb *, int) = in_rtchange; @@ -283,12 +295,12 @@ rip_ctlinput(int cmd, struct sockaddr *s else if (errno == 0) return NULL; if (ip) { - rip_pcbnotify(&rawcbtable, satosin(sa)->sin_addr, + rip_pcbnotify(&rawcbtable, satocsin(sa)->sin_addr, ip->ip_src, ip->ip_p, errno, notify); /* XXX mapped address case */ } else - in_pcbnotifyall(&rawcbtable, satosin(sa)->sin_addr, errno, + in_pcbnotifyall(&rawcbtable, satocsin(sa)->sin_addr, errno, notify); return NULL; } @@ -298,17 +310,11 @@ rip_ctlinput(int cmd, struct sockaddr *s * Tack on options user may have setup with control call. */ int -rip_output(struct mbuf *m, ...) +rip_output(struct mbuf *m, struct inpcb *inp) { - struct inpcb *inp; struct ip *ip; struct mbuf *opts; int flags; - va_list ap; - - va_start(ap, m); - inp = va_arg(ap, struct inpcb *); - va_end(ap); flags = (inp->inp_socket->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST @@ -363,46 +369,62 @@ rip_output(struct mbuf *m, ...) } HTONS(ip->ip_len); HTONS(ip->ip_off); - if (ip->ip_id == 0) - ip->ip_id = ip_newid(); + 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, - inp->inp_socket, &inp->inp_errormtu)); + + /* + * IP output. Note: if IP_RETURNMTU flag is set, the MTU size + * will be stored in inp_errormtu. + */ + return ip_output(m, opts, &inp->inp_route, flags, inp->inp_moptions, + inp->inp_socket); } /* * Raw IP socket option processing. */ int -rip_ctloutput(int op, struct socket *so, int level, int optname, - struct mbuf **m) +rip_ctloutput(int op, struct socket *so, struct sockopt *sopt) { 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); - if (level != IPPROTO_IP) { - error = ENOPROTOOPT; - if (op == PRCO_SETOPT && *m != 0) - (void) m_free(*m); - } else switch (op) { + switch (op) { case PRCO_SETOPT: - switch (optname) { + switch (sopt->sopt_name) { case IP_HDRINCL: - if (*m == 0 || (*m)->m_len < sizeof (int)) - error = EINVAL; - else { - if (*mtod(*m, int *)) - inp->inp_flags |= INP_HDRINCL; - else - inp->inp_flags &= ~INP_HDRINCL; - } - if (*m != 0) - (void) m_free(*m); + error = sockopt_getint(sopt, &optval); + if (error) + break; + if (optval) + inp->inp_flags |= INP_HDRINCL; + else + inp->inp_flags &= ~INP_HDRINCL; break; #ifdef MROUTING @@ -416,23 +438,21 @@ rip_ctloutput(int op, struct socket *so, case MRT_API_CONFIG: case MRT_ADD_BW_UPCALL: case MRT_DEL_BW_UPCALL: - error = ip_mrouter_set(so, optname, m); + error = ip_mrouter_set(so, sopt); break; #endif default: - error = ip_ctloutput(op, so, level, optname, m); + error = ip_ctloutput(op, so, sopt); break; } break; case PRCO_GETOPT: - switch (optname) { + switch (sopt->sopt_name) { case IP_HDRINCL: - *m = m_get(M_WAIT, MT_SOOPTS); - MCLAIM((*m), so->so_mowner); - (*m)->m_len = sizeof (int); - *mtod(*m, int *) = inp->inp_flags & INP_HDRINCL ? 1 : 0; + optval = inp->inp_flags & INP_HDRINCL; + error = sockopt_set(sopt, &optval, sizeof(optval)); break; #ifdef MROUTING @@ -440,244 +460,409 @@ rip_ctloutput(int op, struct socket *so, case MRT_ASSERT: case MRT_API_SUPPORT: case MRT_API_CONFIG: - error = ip_mrouter_get(so, optname, m); + error = ip_mrouter_get(so, sopt); break; #endif default: - error = ip_ctloutput(op, so, level, optname, m); + error = ip_ctloutput(op, so, sopt); break; } break; } - return (error); + out: + return error; } int -rip_bind(struct inpcb *inp, struct mbuf *nam) +rip_connect_pcb(struct inpcb *inp, struct sockaddr_in *addr) { - struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *); - if (nam->m_len != sizeof(*addr)) - return (EINVAL); - if (TAILQ_FIRST(&ifnet) == 0) + if (IFNET_READER_EMPTY()) return (EADDRNOTAVAIL); - if (addr->sin_family != AF_INET && - addr->sin_family != AF_IMPLINK) + 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; + inp->inp_faddr = addr->sin_addr; return (0); } -int -rip_connect(struct inpcb *inp, struct mbuf *nam) +static void +rip_disconnect1(struct inpcb *inp) { - 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 && - addr->sin_family != AF_IMPLINK) - return (EAFNOSUPPORT); - inp->inp_faddr = addr->sin_addr; - return (0); + inp->inp_faddr = zeroin_addr; } -void -rip_disconnect(struct inpcb *inp) +static int +rip_attach(struct socket *so, int proto) { + struct inpcb *inp; + int error; - inp->inp_faddr = zeroin_addr; -} + KASSERT(sotoinpcb(so) == NULL); + sosetlock(so); -u_long rip_sendspace = RIPSNDQ; -u_long rip_recvspace = RIPRCVQ; + if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { + error = soreserve(so, rip_sendspace, rip_recvspace); + if (error) { + return error; + } + } -/*ARGSUSED*/ -int -rip_usrreq(struct socket *so, int req, - struct mbuf *m, struct mbuf *nam, struct mbuf *control, struct lwp *l) + error = in_pcballoc(so, &rawcbtable); + if (error) { + return error; + } + inp = sotoinpcb(so); + inp->inp_ip.ip_p = proto; + KASSERT(solocked(so)); + + return 0; +} + +static void +rip_detach(struct socket *so) { struct inpcb *inp; - int s; - int error = 0; + + KASSERT(solocked(so)); + inp = sotoinpcb(so); + KASSERT(inp != NULL); + #ifdef MROUTING extern struct socket *ip_mrouter; + if (so == ip_mrouter) { + ip_mrouter_done(); + } #endif + in_pcbdetach(inp); +} - if (req == PRU_CONTROL) - return (in_control(so, (long)m, (caddr_t)nam, - (struct ifnet *)control, l)); - - if (req == PRU_PURGEIF) { - in_pcbpurgeif0(&rawcbtable, (struct ifnet *)control); - in_purgeif((struct ifnet *)control); - in_pcbpurgeif(&rawcbtable, (struct ifnet *)control); - return (0); - } +static int +rip_accept(struct socket *so, struct sockaddr *nam) +{ + KASSERT(solocked(so)); + + panic("rip_accept"); + + return EOPNOTSUPP; +} + +static int +rip_bind(struct socket *so, struct sockaddr *nam, struct lwp *l) +{ + struct inpcb *inp = sotoinpcb(so); + struct sockaddr_in *addr = (struct sockaddr_in *)nam; + int error = 0; + int s, ss; + struct ifaddr *ifa; + + KASSERT(solocked(so)); + KASSERT(inp != NULL); + KASSERT(nam != NULL); + + if (addr->sin_len != sizeof(*addr)) + return EINVAL; s = splsoftnet(); - inp = sotoinpcb(so); -#ifdef DIAGNOSTIC - if (req != PRU_SEND && req != PRU_SENDOOB && control) - panic("rip_usrreq: unexpected control mbuf"); -#endif - if (inp == 0 && req != PRU_ATTACH) { - error = EINVAL; + if (IFNET_READER_EMPTY()) { + error = EADDRNOTAVAIL; goto release; } + if (addr->sin_family != AF_INET) { + error = EAFNOSUPPORT; + goto release; + } + ss = pserialize_read_enter(); + if ((ifa = ifa_ifwithaddr(sintosa(addr))) == NULL && + !in_nullhost(addr->sin_addr)) + { + pserialize_read_exit(ss); + error = EADDRNOTAVAIL; + goto release; + } + if (ifa && (ifatoia(ifa))->ia4_flags & IN6_IFF_DUPLICATED) { + pserialize_read_exit(ss); + error = EADDRNOTAVAIL; + goto release; + } + pserialize_read_exit(ss); - switch (req) { + inp->inp_laddr = addr->sin_addr; - case PRU_ATTACH: - if (inp != 0) { - error = EISCONN; - break; - } - if (l == 0 || (error = kauth_authorize_generic(l->l_cred, - KAUTH_GENERIC_ISSUSER, &l->l_acflag))) { - error = EACCES; - break; - } - 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 = sotoinpcb(so); - inp->inp_ip.ip_p = (long)nam; - break; +release: + splx(s); + return error; +} - case PRU_DETACH: -#ifdef MROUTING - if (so == ip_mrouter) - ip_mrouter_done(); -#endif - in_pcbdetach(inp); - break; +static int +rip_listen(struct socket *so, struct lwp *l) +{ + KASSERT(solocked(so)); - case PRU_BIND: - error = rip_bind(inp, nam); - break; + return EOPNOTSUPP; +} - case PRU_LISTEN: - error = EOPNOTSUPP; - break; +static int +rip_connect(struct socket *so, struct sockaddr *nam, struct lwp *l) +{ + struct inpcb *inp = sotoinpcb(so); + int error = 0; + int s; - case PRU_CONNECT: - error = rip_connect(inp, nam); - if (error) - break; + KASSERT(solocked(so)); + KASSERT(inp != NULL); + KASSERT(nam != NULL); + + s = splsoftnet(); + error = rip_connect_pcb(inp, (struct sockaddr_in *)nam); + if (! error) soisconnected(so); - break; + splx(s); - case PRU_CONNECT2: - error = EOPNOTSUPP; - break; + return error; +} - case PRU_DISCONNECT: - soisdisconnected(so); - rip_disconnect(inp); - break; +static int +rip_connect2(struct socket *so, struct socket *so2) +{ + KASSERT(solocked(so)); + + return EOPNOTSUPP; +} + +static int +rip_disconnect(struct socket *so) +{ + struct inpcb *inp = sotoinpcb(so); + int s; + + KASSERT(solocked(so)); + KASSERT(inp != NULL); + + s = splsoftnet(); + soisdisconnected(so); + rip_disconnect1(inp); + splx(s); + + return 0; +} + +static int +rip_shutdown(struct socket *so) +{ + int s; + + KASSERT(solocked(so)); /* * Mark the connection as being incapable of further input. */ - case PRU_SHUTDOWN: - socantsendmore(so); - break; + s = splsoftnet(); + socantsendmore(so); + splx(s); - case PRU_RCVD: - error = EOPNOTSUPP; - break; + return 0; +} + +static int +rip_abort(struct socket *so) +{ + KASSERT(solocked(so)); + + panic("rip_abort"); + + return EOPNOTSUPP; +} + +static int +rip_ioctl(struct socket *so, u_long cmd, void *nam, struct ifnet *ifp) +{ + return in_control(so, cmd, nam, ifp); +} + +static int +rip_stat(struct socket *so, struct stat *ub) +{ + KASSERT(solocked(so)); + + /* stat: don't bother with a blocksize. */ + return 0; +} + +static int +rip_peeraddr(struct socket *so, struct sockaddr *nam) +{ + int s; + + KASSERT(solocked(so)); + KASSERT(sotoinpcb(so) != NULL); + KASSERT(nam != NULL); + + s = splsoftnet(); + in_setpeeraddr(sotoinpcb(so), (struct sockaddr_in *)nam); + splx(s); + + return 0; +} + +static int +rip_sockaddr(struct socket *so, struct sockaddr *nam) +{ + int s; + + KASSERT(solocked(so)); + KASSERT(sotoinpcb(so) != NULL); + KASSERT(nam != NULL); + + s = splsoftnet(); + in_setsockaddr(sotoinpcb(so), (struct sockaddr_in *)nam); + splx(s); + + return 0; +} + +static int +rip_rcvd(struct socket *so, int flags, struct lwp *l) +{ + KASSERT(solocked(so)); + + return EOPNOTSUPP; +} + +static int +rip_recvoob(struct socket *so, struct mbuf *m, int flags) +{ + KASSERT(solocked(so)); + + return EOPNOTSUPP; +} + +static int +rip_send(struct socket *so, struct mbuf *m, struct sockaddr *nam, + struct mbuf *control, struct lwp *l) +{ + struct inpcb *inp = sotoinpcb(so); + int error = 0; + int s; + + KASSERT(solocked(so)); + KASSERT(inp != NULL); + KASSERT(m != NULL); /* * Ship a packet out. The appropriate raw output * routine handles any massaging necessary. */ - case PRU_SEND: - if (control && control->m_len) { - m_freem(control); + if (control && control->m_len) { + m_freem(control); + m_freem(m); + return EINVAL; + } + + s = splsoftnet(); + if (nam) { + if ((so->so_state & SS_ISCONNECTED) != 0) { + error = EISCONN; + goto die; + } + error = rip_connect_pcb(inp, (struct sockaddr_in *)nam); + if (error) { + die: m_freem(m); - error = EINVAL; - break; + splx(s); + return error; + } + } else { + if ((so->so_state & SS_ISCONNECTED) == 0) { + error = ENOTCONN; + goto die; } - { - 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; - } - } else { - if ((so->so_state & SS_ISCONNECTED) == 0) { - error = ENOTCONN; - goto die; - } - } - error = rip_output(m, inp); - if (nam) - rip_disconnect(inp); } - break; + error = rip_output(m, inp); + if (nam) + rip_disconnect1(inp); - case PRU_SENSE: - /* - * stat: don't bother with a blocksize. - */ - splx(s); - return (0); + splx(s); + return error; +} - case PRU_RCVOOB: - error = EOPNOTSUPP; - break; +static int +rip_sendoob(struct socket *so, struct mbuf *m, struct mbuf *control) +{ + KASSERT(solocked(so)); - case PRU_SENDOOB: - m_freem(control); - m_freem(m); - error = EOPNOTSUPP; - break; + m_freem(m); + m_freem(control); - case PRU_SOCKADDR: - in_setsockaddr(inp, nam); - break; - - case PRU_PEERADDR: - in_setpeeraddr(inp, nam); - break; + return EOPNOTSUPP; +} - default: - panic("rip_usrreq"); - } +static int +rip_purgeif(struct socket *so, struct ifnet *ifp) +{ + int s; -release: + s = splsoftnet(); + mutex_enter(softnet_lock); + in_pcbpurgeif0(&rawcbtable, ifp); + in_purgeif(ifp); + in_pcbpurgeif(&rawcbtable, ifp); + mutex_exit(softnet_lock); splx(s); - return (error); + + return 0; } -SYSCTL_SETUP(sysctl_net_inet_raw_setup, "sysctl net.inet.raw subtree setup") +PR_WRAP_USRREQS(rip) +#define rip_attach rip_attach_wrapper +#define rip_detach rip_detach_wrapper +#define rip_accept rip_accept_wrapper +#define rip_bind rip_bind_wrapper +#define rip_listen rip_listen_wrapper +#define rip_connect rip_connect_wrapper +#define rip_connect2 rip_connect2_wrapper +#define rip_disconnect rip_disconnect_wrapper +#define rip_shutdown rip_shutdown_wrapper +#define rip_abort rip_abort_wrapper +#define rip_ioctl rip_ioctl_wrapper +#define rip_stat rip_stat_wrapper +#define rip_peeraddr rip_peeraddr_wrapper +#define rip_sockaddr rip_sockaddr_wrapper +#define rip_rcvd rip_rcvd_wrapper +#define rip_recvoob rip_recvoob_wrapper +#define rip_send rip_send_wrapper +#define rip_sendoob rip_sendoob_wrapper +#define rip_purgeif rip_purgeif_wrapper + +const struct pr_usrreqs rip_usrreqs = { + .pr_attach = rip_attach, + .pr_detach = rip_detach, + .pr_accept = rip_accept, + .pr_bind = rip_bind, + .pr_listen = rip_listen, + .pr_connect = rip_connect, + .pr_connect2 = rip_connect2, + .pr_disconnect = rip_disconnect, + .pr_shutdown = rip_shutdown, + .pr_abort = rip_abort, + .pr_ioctl = rip_ioctl, + .pr_stat = rip_stat, + .pr_peeraddr = rip_peeraddr, + .pr_sockaddr = rip_sockaddr, + .pr_rcvd = rip_rcvd, + .pr_recvoob = rip_recvoob, + .pr_send = rip_send, + .pr_sendoob = rip_sendoob, + .pr_purgeif = rip_purgeif, +}; + +static void +sysctl_net_inet_raw_setup(struct sysctllog **clog) { sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "net", NULL, - NULL, 0, NULL, 0, - CTL_NET, CTL_EOL); - sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "inet", NULL, NULL, 0, NULL, 0, CTL_NET, PF_INET, CTL_EOL);