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.118.2.1
retrieving revision 1.131
diff -u -p -r1.118.2.1 -r1.131
--- src/sys/netinet/raw_ip.c	2014/08/10 06:56:25	1.118.2.1
+++ src/sys/netinet/raw_ip.c	2014/07/07 17:13:56	1.131
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip.c,v 1.118.2.1 2014/08/10 06:56:25 tls Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.131 2014/07/07 17:13:56 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.118.2.1 2014/08/10 06:56:25 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.131 2014/07/07 17:13:56 rtr Exp $");
 
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
@@ -112,8 +112,9 @@ struct inpcbtable rawcbtable;
 
 int	 rip_pcbnotify(struct inpcbtable *, struct in_addr,
     struct in_addr, int, int, void (*)(struct inpcb *, int));
-int	 rip_connect_pcb(struct inpcb *, struct mbuf *);
-static void	 rip_disconnect1(struct inpcb *);
+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 **);
 
@@ -481,13 +482,31 @@ rip_ctloutput(int op, struct socket *so,
 }
 
 int
-rip_connect_pcb(struct inpcb *inp, struct mbuf *nam)
+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_EMPTY())
+	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())
 		return (EADDRNOTAVAIL);
 	if (addr->sin_family != AF_INET)
 		return (EAFNOSUPPORT);
@@ -495,8 +514,8 @@ rip_connect_pcb(struct inpcb *inp, struc
 	return (0);
 }
 
-static void
-rip_disconnect1(struct inpcb *inp)
+void
+rip_disconnect(struct inpcb *inp)
 {
 
 	inp->inp_faddr = zeroin_addr;
@@ -548,134 +567,6 @@ rip_detach(struct socket *so)
 }
 
 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 lwp *l)
-{
-	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_EMPTY()) {
-		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, struct lwp *l)
-{
-	KASSERT(solocked(so));
-
-	return EOPNOTSUPP;
-}
-
-static int
-rip_connect(struct socket *so, struct mbuf *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, 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);
@@ -690,206 +581,148 @@ rip_stat(struct socket *so, struct stat 
 	return 0;
 }
 
-static int
-rip_peeraddr(struct socket *so, struct mbuf *nam)
+int
+rip_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
+    struct mbuf *control, struct lwp *l)
 {
-	int s;
+	struct inpcb *inp;
+	int s, error = 0;
 
-	KASSERT(solocked(so));
-	KASSERT(sotoinpcb(so) != NULL);
-	KASSERT(nam != NULL);
+	KASSERT(req != PRU_ATTACH);
+	KASSERT(req != PRU_DETACH);
+	KASSERT(req != PRU_CONTROL);
+	KASSERT(req != PRU_SENSE);
 
 	s = splsoftnet();
-	in_setpeeraddr(sotoinpcb(so), nam);
-	splx(s);
-
-	return 0;
-}
-
-static int
-rip_sockaddr(struct socket *so, struct mbuf *nam)
-{
-	int s;
+	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));
-	KASSERT(sotoinpcb(so) != NULL);
-	KASSERT(nam != NULL);
+	inp = sotoinpcb(so);
 
-	s = splsoftnet();
-	in_setsockaddr(sotoinpcb(so), nam);
-	splx(s);
+	KASSERT(!control || (req == PRU_SEND || req == PRU_SENDOOB));
+	if (inp == NULL) {
+		splx(s);
+		return EINVAL;
+	}
 
-	return 0;
-}
+	switch (req) {
 
-static int
-rip_rcvd(struct socket *so, int flags, 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_recvoob(struct socket *so, struct mbuf *m, int flags)
-{
-	KASSERT(solocked(so));
+	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_send(struct socket *so, struct mbuf *m, struct mbuf *nam,
-    struct mbuf *control, struct lwp *l)
-{
-	struct inpcb *inp = sotoinpcb(so);
-	int error = 0;
-	int s;
+	case PRU_DISCONNECT:
+		soisdisconnected(so);
+		rip_disconnect(inp);
+		break;
 
-	KASSERT(solocked(so));
-	KASSERT(inp != NULL);
-	KASSERT(m != NULL);
+	/*
+	 * Mark the connection as being incapable of further input.
+	 */
+	case PRU_SHUTDOWN:
+		socantsendmore(so);
+		break;
+
+	case PRU_RCVD:
+		error = EOPNOTSUPP;
+		break;
 
 	/*
 	 * Ship a packet out.  The appropriate raw output
 	 * routine handles any massaging necessary.
 	 */
-	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, nam);
-		if (error) {
-		die:
+	case PRU_SEND:
+		if (control && control->m_len) {
+			m_freem(control);
 			m_freem(m);
-			splx(s);
-			return error;
-		}
-	} else {
-		if ((so->so_state & SS_ISCONNECTED) == 0) {
-			error = ENOTCONN;
-			goto die;
+			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;
+			}
+		} else {
+			if ((so->so_state & SS_ISCONNECTED) == 0) {
+				error = ENOTCONN;
+				goto die;
+			}
+		}
+		error = rip_output(m, inp);
+		if (nam)
+			rip_disconnect(inp);
 	}
-	error = rip_output(m, inp);
-	if (nam)
-		rip_disconnect1(inp);
-
-	splx(s);
-	return error;
-}
+		break;
 
-static int
-rip_sendoob(struct socket *so, struct mbuf *m, struct mbuf *control)
-{
-	KASSERT(solocked(so));
+	case PRU_RCVOOB:
+		error = EOPNOTSUPP;
+		break;
 
-	m_freem(m);
-	m_freem(control);
+	case PRU_SENDOOB:
+		m_freem(control);
+		m_freem(m);
+		error = EOPNOTSUPP;
+		break;
 
-	return EOPNOTSUPP;
-}
+	case PRU_SOCKADDR:
+		in_setsockaddr(inp, nam);
+		break;
 
-static int
-rip_purgeif(struct socket *so, struct ifnet *ifp)
-{
-	int s;
+	case PRU_PEERADDR:
+		in_setpeeraddr(inp, nam);
+		break;
 
-	s = splsoftnet();
-	mutex_enter(softnet_lock);
-	in_pcbpurgeif0(&rawcbtable, ifp);
-	in_purgeif(ifp);
-	in_pcbpurgeif(&rawcbtable, ifp);
-	mutex_exit(softnet_lock);
+	default:
+		panic("rip_usrreq");
+	}
 	splx(s);
 
-	return 0;
-}
-
-int
-rip_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
-    struct mbuf *control, struct lwp *l)
-{
-	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_CONNECT2);
-	KASSERT(req != PRU_DISCONNECT);
-	KASSERT(req != PRU_SHUTDOWN);
-	KASSERT(req != PRU_ABORT);
-	KASSERT(req != PRU_CONTROL);
-	KASSERT(req != PRU_SENSE);
-	KASSERT(req != PRU_PEERADDR);
-	KASSERT(req != PRU_SOCKADDR);
-	KASSERT(req != PRU_RCVD);
-	KASSERT(req != PRU_RCVOOB);
-	KASSERT(req != PRU_SEND);
-	KASSERT(req != PRU_SENDOOB);
-	KASSERT(req != PRU_PURGEIF);
-
-	KASSERT(solocked(so));
-
-	if (sotoinpcb(so) == NULL)
-		return EINVAL;
-
-	panic("rip_usrreq");
-
-	return 0;
+	return error;
 }
 
 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
 #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_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,
 	.pr_generic	= rip_usrreq,
 };