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.132 retrieving revision 1.158.2.3 diff -u -p -r1.132 -r1.158.2.3 --- src/sys/netinet/raw_ip.c 2014/07/09 04:54:04 1.132 +++ src/sys/netinet/raw_ip.c 2017/03/20 06:57:50 1.158.2.3 @@ -1,4 +1,4 @@ -/* $NetBSD: raw_ip.c,v 1.132 2014/07/09 04:54:04 rtr Exp $ */ +/* $NetBSD: raw_ip.c,v 1.158.2.3 2017/03/20 06:57:50 pgoyette Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -65,16 +65,18 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.132 2014/07/09 04:54:04 rtr Exp $"); +__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.158.2.3 2017/03/20 06:57:50 pgoyette Exp $"); +#ifdef _KERNEL_OPT #include "opt_inet.h" #include "opt_compat_netbsd.h" #include "opt_ipsec.h" #include "opt_mrouting.h" +#include "opt_net_mpsafe.h" +#endif #include #include -#include #include #include #include @@ -85,7 +87,6 @@ __KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1 #include #include -#include #include #include @@ -112,9 +113,8 @@ 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 **); @@ -311,17 +311,11 @@ rip_ctlinput(int cmd, const struct socka * 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 @@ -389,7 +383,7 @@ rip_output(struct mbuf *m, ...) * will be stored in inp_errormtu. */ return ip_output(m, opts, &inp->inp_route, flags, inp->inp_moptions, - inp->inp_socket); + inp); } /* @@ -482,31 +476,10 @@ rip_ctloutput(int op, struct socket *so, } 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 (!IFNET_FIRST()) - 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 (!IFNET_FIRST()) + if (IFNET_READER_EMPTY()) return (EADDRNOTAVAIL); if (addr->sin_family != AF_INET) return (EAFNOSUPPORT); @@ -514,8 +487,8 @@ rip_connect(struct inpcb *inp, struct mb return (0); } -void -rip_disconnect(struct inpcb *inp) +static void +rip_disconnect1(struct inpcb *inp) { inp->inp_faddr = zeroin_addr; @@ -567,6 +540,143 @@ rip_detach(struct socket *so) } 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(); + 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); + + inp->inp_laddr = addr->sin_addr; + +release: + splx(s); + return error; +} + +static int +rip_listen(struct socket *so, struct lwp *l) +{ + KASSERT(solocked(so)); + + return EOPNOTSUPP; +} + +static int +rip_connect(struct socket *so, struct sockaddr *nam, struct lwp *l) +{ + struct inpcb *inp = sotoinpcb(so); + int error = 0; + int s; + + KASSERT(solocked(so)); + KASSERT(inp != NULL); + KASSERT(nam != NULL); + + s = splsoftnet(); + error = rip_connect_pcb(inp, (struct sockaddr_in *)nam); + if (! error) + soisconnected(so); + splx(s); + + return error; +} + +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. + */ + s = splsoftnet(); + socantsendmore(so); + splx(s); + + 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); @@ -582,168 +692,176 @@ rip_stat(struct socket *so, struct stat } static int -rip_peeraddr(struct socket *so, struct mbuf *nam) +rip_peeraddr(struct socket *so, struct sockaddr *nam) { - KASSERT(solocked(0)); + int s; + + KASSERT(solocked(so)); KASSERT(sotoinpcb(so) != NULL); KASSERT(nam != NULL); - in_setpeeraddr(sotoinpcb(so), nam); + s = splsoftnet(); + in_setpeeraddr(sotoinpcb(so), (struct sockaddr_in *)nam); + splx(s); + return 0; } static int -rip_sockaddr(struct socket *so, struct mbuf *nam) +rip_sockaddr(struct socket *so, struct sockaddr *nam) { - KASSERT(solocked(0)); + int s; + + KASSERT(solocked(so)); KASSERT(sotoinpcb(so) != NULL); KASSERT(nam != NULL); - in_setsockaddr(sotoinpcb(so), nam); + s = splsoftnet(); + in_setsockaddr(sotoinpcb(so), (struct sockaddr_in *)nam); + splx(s); + return 0; } -int -rip_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, - struct mbuf *control, struct lwp *l) +static int +rip_rcvd(struct socket *so, int flags, struct lwp *l) { - struct inpcb *inp; - int s, error = 0; - - KASSERT(req != PRU_ATTACH); - KASSERT(req != PRU_DETACH); - KASSERT(req != PRU_CONTROL); - KASSERT(req != PRU_SENSE); - KASSERT(req != PRU_PEERADDR); - KASSERT(req != PRU_SOCKADDR); - - 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; - } - KASSERT(solocked(so)); - inp = sotoinpcb(so); - - KASSERT(!control || (req == PRU_SEND || req == PRU_SENDOOB)); - if (inp == NULL) { - splx(s); - return EINVAL; - } - - switch (req) { - - 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; + return EOPNOTSUPP; +} - case PRU_CONNECT2: - error = EOPNOTSUPP; - break; +static int +rip_recvoob(struct socket *so, struct mbuf *m, int flags) +{ + KASSERT(solocked(so)); - case PRU_DISCONNECT: - soisdisconnected(so); - rip_disconnect(inp); - break; + return EOPNOTSUPP; +} - /* - * Mark the connection as being incapable of further input. - */ - case PRU_SHUTDOWN: - socantsendmore(so); - break; +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; - case PRU_RCVD: - error = EOPNOTSUPP; - break; + 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_RCVOOB: - error = EOPNOTSUPP; - break; + splx(s); + return error; +} - case PRU_SENDOOB: - m_freem(control); - m_freem(m); - error = EOPNOTSUPP; - break; +static int +rip_sendoob(struct socket *so, struct mbuf *m, struct mbuf *control) +{ + KASSERT(solocked(so)); - default: - panic("rip_usrreq"); - } + m_freem(m); + m_freem(control); + + return EOPNOTSUPP; +} + +static int +rip_purgeif(struct socket *so, struct ifnet *ifp) +{ + int s; + + s = splsoftnet(); + mutex_enter(softnet_lock); + in_pcbpurgeif0(&rawcbtable, ifp); +#ifdef NET_MPSAFE + mutex_exit(softnet_lock); +#endif + in_purgeif(ifp); +#ifdef NET_MPSAFE + mutex_enter(softnet_lock); +#endif + in_pcbpurgeif(&rawcbtable, ifp); + mutex_exit(softnet_lock); splx(s); - return error; + return 0; } 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_usrreq rip_usrreq_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_generic = rip_usrreq, + .pr_rcvd = rip_rcvd, + .pr_recvoob = rip_recvoob, + .pr_send = rip_send, + .pr_sendoob = rip_sendoob, + .pr_purgeif = rip_purgeif, }; static void