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.105.2.1 retrieving revision 1.137 diff -u -p -r1.105.2.1 -r1.137 --- src/sys/netinet/raw_ip.c 2008/05/18 12:35:29 1.105.2.1 +++ src/sys/netinet/raw_ip.c 2014/07/30 10:04:26 1.137 @@ -1,4 +1,4 @@ -/* $NetBSD: raw_ip.c,v 1.105.2.1 2008/05/18 12:35:29 yamt Exp $ */ +/* $NetBSD: raw_ip.c,v 1.137 2014/07/30 10:04:26 rtr Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -60,10 +60,15 @@ * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 */ +/* + * Raw interface to IP protocol. + */ + #include -__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.105.2.1 2008/05/18 12:35:29 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.137 2014/07/30 10:04:26 rtr Exp $"); #include "opt_inet.h" +#include "opt_compat_netbsd.h" #include "opt_ipsec.h" #include "opt_mrouting.h" @@ -93,33 +98,34 @@ __KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1 #include #include -#include - #ifdef IPSEC -#include -#include -#endif /* IPSEC */ - -#ifdef FAST_IPSEC #include #include #include -#endif /* FAST_IPSEC */ +#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 *); +int rip_connect_pcb(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. */ #define RIPSNDQ 8192 #define RIPRCVQ 8192 +static u_long rip_sendspace = RIPSNDQ; +static u_long rip_recvspace = RIPRCVQ; + /* * Raw interface to IP protocol. */ @@ -131,6 +137,7 @@ void rip_init(void) { + sysctl_net_inet_raw_setup(NULL); in_pcbinit(&rawcbtable, 1, 1); } @@ -140,8 +147,11 @@ rip_sbappendaddr(struct inpcb *last, str { if (last->inp_flags & INP_NOHEADER) m_adj(n, hlen); - if (last->inp_flags & INP_CONTROLOPTS || - last->inp_socket->so_options & SO_TIMESTAMP) + 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 */ @@ -185,7 +195,7 @@ rip_input(struct mbuf *m, ...) ip->ip_len = ntohs(ip->ip_len) - hlen; NTOHS(ip->ip_off); - CIRCLEQ_FOREACH(inph, &rawcbtable.inpt_queue, inph_queue) { + TAILQ_FOREACH(inph, &rawcbtable.inpt_queue, inph_queue) { inp = (struct inpcb *)inph; if (inp->inp_af != AF_INET) continue; @@ -199,9 +209,10 @@ rip_input(struct mbuf *m, ...) continue; if (last == NULL) ; -#if defined(IPSEC) || defined(FAST_IPSEC) +#if defined(IPSEC) /* check AH/ESP integrity. */ - else if (ipsec4_in_reject_so(m, last->inp_socket)) { + else if (ipsec_used && + ipsec4_in_reject_so(m, last->inp_socket)) { IPSEC_STATINC(IPSEC_STAT_IN_POLVIO); /* do not inject data to pcb */ } @@ -213,9 +224,10 @@ rip_input(struct mbuf *m, ...) } last = inp; } -#if defined(IPSEC) || defined(FAST_IPSEC) +#if defined(IPSEC) /* check AH/ESP integrity. */ - if (last != NULL && ipsec4_in_reject_so(m, last->inp_socket)) { + if (ipsec_used && last != NULL + && ipsec4_in_reject_so(m, last->inp_socket)) { m_freem(m); IPSEC_STATINC(IPSEC_STAT_IN_POLVIO); IP_STATDEC(IP_STAT_DELIVERED); @@ -243,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) @@ -372,48 +382,56 @@ rip_output(struct mbuf *m, ...) flags |= IP_RAWOUTPUT; 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 (level == SOL_SOCKET && optname == SO_NOHEADER) { + if (sopt->sopt_level == SOL_SOCKET && sopt->sopt_name == SO_NOHEADER) { if (op == PRCO_GETOPT) { - *m = m_intopt(so, - (inp->inp_flags & INP_NOHEADER) ? 1 : 0); - return 0; - } else if (*m == NULL || (*m)->m_len != sizeof(int)) - error = EINVAL; - else if (*mtod(*m, int *)) { - inp->inp_flags &= ~INP_HDRINCL; - inp->inp_flags |= INP_NOHEADER; - } else - inp->inp_flags &= ~INP_NOHEADER; - goto free_m; - } else if (level != IPPROTO_IP) - return ip_ctloutput(op, so, level, optname, m); + 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 (optname) { + switch (sopt->sopt_name) { case IP_HDRINCL: - if (*m == NULL || (*m)->m_len != sizeof(int)) - error = EINVAL; - else if (*mtod(*m, int *)) + error = sockopt_getint(sopt, &optval); + if (error) + break; + if (optval) inp->inp_flags |= INP_HDRINCL; else inp->inp_flags &= ~INP_HDRINCL; - goto free_m; + break; #ifdef MROUTING case MRT_INIT: @@ -426,20 +444,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_intopt(so, inp->inp_flags & INP_HDRINCL ? 1 : 0); + optval = inp->inp_flags & INP_HDRINCL; + error = sockopt_set(sopt, &optval, sizeof(optval)); break; #ifdef MROUTING @@ -447,53 +466,30 @@ 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; } + out: return error; -free_m: - if (op == PRCO_SETOPT && *m != NULL) - (void)m_free(*m); - 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 && - addr->sin_family != AF_IMPLINK) - 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) +rip_connect_pcb(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) + if (!IFNET_FIRST()) return (EADDRNOTAVAIL); - if (addr->sin_family != AF_INET && - addr->sin_family != AF_IMPLINK) + if (addr->sin_family != AF_INET) return (EAFNOSUPPORT); inp->inp_faddr = addr->sin_addr; return (0); @@ -506,27 +502,205 @@ rip_disconnect(struct inpcb *inp) inp->inp_faddr = zeroin_addr; } -u_long rip_sendspace = RIPSNDQ; -u_long rip_recvspace = RIPRCVQ; +static int +rip_attach(struct socket *so, int proto) +{ + struct inpcb *inp; + int error; -/*ARGSUSED*/ -int -rip_usrreq(struct socket *so, int req, - struct mbuf *m, struct mbuf *nam, struct mbuf *control, struct lwp *l) + KASSERT(sotoinpcb(so) == NULL); + sosetlock(so); + + if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { + error = soreserve(so, rip_sendspace, rip_recvspace); + if (error) { + return error; + } + } + + 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); +} + +static int +rip_accept(struct socket *so, struct mbuf *nam) +{ + KASSERT(solocked(so)); + + panic("rip_accept"); + + return EOPNOTSUPP; +} + +static int +rip_bind(struct socket *so, struct mbuf *nam) +{ + struct inpcb *inp = sotoinpcb(so); + struct sockaddr_in *addr; + int error = 0; + int s; + + KASSERT(solocked(so)); + KASSERT(inp != NULL); + KASSERT(nam != NULL); + + s = splsoftnet(); + addr = mtod(nam, struct sockaddr_in *); + if (nam->m_len != sizeof(*addr)) { + error = EINVAL; + goto release; + } + if (!IFNET_FIRST()) { + error = EADDRNOTAVAIL; + goto release; + } + if (addr->sin_family != AF_INET) { + error = EAFNOSUPPORT; + goto release; + } + if (!in_nullhost(addr->sin_addr) && + ifa_ifwithaddr(sintosa(addr)) == 0) { + error = EADDRNOTAVAIL; + goto release; + } + inp->inp_laddr = addr->sin_addr; + +release: + splx(s); + return error; +} + +static int +rip_listen(struct socket *so) +{ + KASSERT(solocked(so)); + + return EOPNOTSUPP; +} + +static int +rip_connect(struct socket *so, struct mbuf *nam) +{ + struct inpcb *inp = sotoinpcb(so); + int error = 0; + int s; - if (req == PRU_CONTROL) - return (in_control(so, (long)m, (void *)nam, - (struct ifnet *)control, l)); + KASSERT(solocked(so)); + KASSERT(inp != NULL); + KASSERT(nam != NULL); s = splsoftnet(); + error = rip_connect_pcb(inp, nam); + if (! error) + soisconnected(so); + + splx(s); + return error; +} + + +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 mbuf *nam) +{ + KASSERT(solocked(so)); + KASSERT(sotoinpcb(so) != NULL); + KASSERT(nam != NULL); + + in_setpeeraddr(sotoinpcb(so), nam); + return 0; +} + +static int +rip_sockaddr(struct socket *so, struct mbuf *nam) +{ + KASSERT(solocked(so)); + KASSERT(sotoinpcb(so) != NULL); + KASSERT(nam != NULL); + + in_setsockaddr(sotoinpcb(so), nam); + return 0; +} + +static int +rip_recvoob(struct socket *so, struct mbuf *m, int flags) +{ + KASSERT(solocked(so)); + + return EOPNOTSUPP; +} + +static int +rip_sendoob(struct socket *so, struct mbuf *m, struct mbuf *control) +{ + KASSERT(solocked(so)); + + m_freem(m); + m_freem(control); + + return EOPNOTSUPP; +} + +int +rip_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, + struct mbuf *control, struct lwp *l) +{ + struct inpcb *inp; + int s, error = 0; + KASSERT(req != PRU_ATTACH); + KASSERT(req != PRU_DETACH); + KASSERT(req != PRU_ACCEPT); + KASSERT(req != PRU_BIND); + KASSERT(req != PRU_LISTEN); + KASSERT(req != PRU_CONNECT); + KASSERT(req != PRU_CONTROL); + KASSERT(req != PRU_SENSE); + KASSERT(req != PRU_PEERADDR); + KASSERT(req != PRU_SOCKADDR); + KASSERT(req != PRU_RCVOOB); + KASSERT(req != PRU_SENDOOB); + + s = splsoftnet(); if (req == PRU_PURGEIF) { mutex_enter(softnet_lock); in_pcbpurgeif0(&rawcbtable, (struct ifnet *)control); @@ -534,70 +708,20 @@ rip_usrreq(struct socket *so, int req, in_pcbpurgeif(&rawcbtable, (struct ifnet *)control); mutex_exit(softnet_lock); splx(s); - return (0); + return 0; } + KASSERT(solocked(so)); 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; - goto release; + + KASSERT(!control || (req == PRU_SEND || req == PRU_SENDOOB)); + if (inp == NULL) { + splx(s); + return EINVAL; } switch (req) { - case PRU_ATTACH: - sosetlock(so); - if (inp != 0) { - error = EISCONN; - break; - } - - if (l == NULL) { - error = EACCES; - break; - } - - /* 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 = sotoinpcb(so); - inp->inp_ip.ip_p = (long)nam; - break; - - case PRU_DETACH: -#ifdef MROUTING - if (so == ip_mrouter) - ip_mrouter_done(); -#endif - in_pcbdetach(inp); - break; - - case PRU_BIND: - error = rip_bind(inp, nam); - break; - - case PRU_LISTEN: - error = EOPNOTSUPP; - break; - - case PRU_CONNECT: - error = rip_connect(inp, nam); - if (error) - break; - soisconnected(so); - break; - case PRU_CONNECT2: error = EOPNOTSUPP; break; @@ -635,7 +759,7 @@ rip_usrreq(struct socket *so, int req, error = EISCONN; goto die; } - error = rip_connect(inp, nam); + error = rip_connect_pcb(inp, nam); if (error) { die: m_freem(m); @@ -653,50 +777,51 @@ rip_usrreq(struct socket *so, int req, } break; - case PRU_SENSE: - /* - * stat: don't bother with a blocksize. - */ - splx(s); - return (0); - - case PRU_RCVOOB: - error = EOPNOTSUPP; - break; - - case PRU_SENDOOB: - m_freem(control); - m_freem(m); - error = EOPNOTSUPP; - break; - - case PRU_SOCKADDR: - in_setsockaddr(inp, nam); - break; - - case PRU_PEERADDR: - in_setpeeraddr(inp, nam); - break; - default: panic("rip_usrreq"); } - -release: splx(s); - return (error); + + return error; } -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_ioctl rip_ioctl_wrapper +#define rip_stat rip_stat_wrapper +#define rip_peeraddr rip_peeraddr_wrapper +#define rip_sockaddr rip_sockaddr_wrapper +#define rip_recvoob rip_recvoob_wrapper +#define rip_sendoob rip_sendoob_wrapper +#define rip_usrreq rip_usrreq_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_ioctl = rip_ioctl, + .pr_stat = rip_stat, + .pr_peeraddr = rip_peeraddr, + .pr_sockaddr = rip_sockaddr, + .pr_recvoob = rip_recvoob, + .pr_sendoob = rip_sendoob, + .pr_generic = rip_usrreq, +}; + +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);