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.121
retrieving revision 1.136
diff -u -p -r1.121 -r1.136
--- src/sys/netinet/raw_ip.c	2014/05/19 02:51:25	1.121
+++ src/sys/netinet/raw_ip.c	2014/07/24 15:12:03	1.136
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip.c,v 1.121 2014/05/19 02:51:25 rmind Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.136 2014/07/24 15:12:03 rtr Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.121 2014/05/19 02:51:25 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.136 2014/07/24 15:12:03 rtr Exp $");
 
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
@@ -112,7 +112,6 @@ 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 *);
 
@@ -212,7 +211,8 @@ rip_input(struct mbuf *m, ...)
 			;
 #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 */
 		}
@@ -226,7 +226,8 @@ rip_input(struct mbuf *m, ...)
 	}
 #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);
@@ -381,8 +382,13 @@ 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);
 }
 
 /*
@@ -475,24 +481,6 @@ rip_ctloutput(int op, struct socket *so,
 }
 
 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 (!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 *);
@@ -559,6 +547,118 @@ rip_detach(struct socket *so)
 	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_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)
@@ -568,10 +668,16 @@ rip_usrreq(struct socket *so, int req, s
 
 	KASSERT(req != PRU_ATTACH);
 	KASSERT(req != PRU_DETACH);
+	KASSERT(req != PRU_ACCEPT);
+	KASSERT(req != PRU_BIND);
+	KASSERT(req != PRU_LISTEN);
+	KASSERT(req != PRU_CONTROL);
+	KASSERT(req != PRU_SENSE);
+	KASSERT(req != PRU_PEERADDR);
+	KASSERT(req != PRU_SOCKADDR);
+	KASSERT(req != PRU_RCVOOB);
+	KASSERT(req != PRU_SENDOOB);
 
-	if (req == PRU_CONTROL) {
-		return in_control(so, (long)m, nam, (ifnet_t *)control, l);
-	}
 	s = splsoftnet();
 	if (req == PRU_PURGEIF) {
 		mutex_enter(softnet_lock);
@@ -594,14 +700,6 @@ rip_usrreq(struct socket *so, int req, s
 
 	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)
@@ -664,31 +762,6 @@ rip_usrreq(struct socket *so, int req, s
 	}
 		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");
 	}
@@ -697,13 +770,32 @@ rip_usrreq(struct socket *so, int req, s
 	return error;
 }
 
-PR_WRAP_USRREQ(rip_usrreq)
-
+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_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_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,
 };