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
retrieving revision 1.25.4.2
retrieving revision 1.26
diff -u -p -r1.25.4.2 -r1.26
--- src/sys/netinet/raw_ip.c	1996/12/11 04:01:08	1.25.4.2
+++ src/sys/netinet/raw_ip.c	1996/05/22 13:55:31	1.26
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip.c,v 1.25.4.2 1996/12/11 04:01:08 mycroft Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.26 1996/05/22 13:55:31 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1993
@@ -60,10 +60,6 @@
 
 struct inpcbtable rawcbtable;
 
-int	 rip_bind __P((struct inpcb *, struct mbuf *));
-int	 rip_connect __P((struct inpcb *, struct mbuf *));
-void	 rip_disconnect __P((struct inpcb *));
-
 /*
  * Nominal space allocated to a raw ip socket.
  */
@@ -109,10 +105,10 @@ rip_input(m, va_alist)
 	    inp = inp->inp_queue.cqe_next) {
 		if (inp->inp_ip.ip_p && inp->inp_ip.ip_p != ip->ip_p)
 			continue;
-		if (inp->inp_laddr.s_addr != INADDR_ANY &&
+		if (inp->inp_laddr.s_addr &&
 		    inp->inp_laddr.s_addr != ip->ip_dst.s_addr)
 			continue;
-		if (inp->inp_faddr.s_addr != INADDR_ANY &&
+		if (inp->inp_faddr.s_addr &&
 		    inp->inp_faddr.s_addr != ip->ip_src.s_addr)
 			continue;
 		if (last) {
@@ -155,28 +151,27 @@ rip_output(m, va_alist)
 	va_dcl
 #endif
 {
-	register struct inpcb *inp;
+	struct socket *so;
+	u_long dst;
 	register struct ip *ip;
+	register struct inpcb *inp;
 	struct mbuf *opts;
 	int flags;
 	va_list ap;
 
 	va_start(ap, m);
-	inp = va_arg(ap, struct inpcb *);
+	so = va_arg(ap, struct socket *);
+	dst = va_arg(ap, u_long);
 	va_end(ap);
 
-	flags =
-	    (inp->inp_socket->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST;
+	inp = sotoinpcb(so);
+	flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST;
 
 	/*
 	 * If the user handed us a complete IP packet, use it.
 	 * Otherwise, allocate an mbuf for a header and fill it in.
 	 */
 	if ((inp->inp_flags & INP_HDRINCL) == 0) {
-		if ((m->m_pkthdr.len + sizeof(struct ip)) > IP_MAXPACKET) {
-			m_freem(m);
-			return (EMSGSIZE);
-		}
 		M_PREPEND(m, sizeof(struct ip), M_WAIT);
 		ip = mtod(m, struct ip *);
 		ip->ip_tos = 0;
@@ -184,14 +179,10 @@ rip_output(m, va_alist)
 		ip->ip_p = inp->inp_ip.ip_p;
 		ip->ip_len = m->m_pkthdr.len;
 		ip->ip_src = inp->inp_laddr;
-		ip->ip_dst = inp->inp_faddr;
+		ip->ip_dst.s_addr = dst;
 		ip->ip_ttl = MAXTTL;
 		opts = inp->inp_options;
 	} else {
-		if (m->m_pkthdr.len > IP_MAXPACKET) {
-			m_freem(m);
-			return (EMSGSIZE);
-		}
 		ip = mtod(m, struct ip *);
 		if (ip->ip_id == 0)
 			ip->ip_id = htons(ip_id++);
@@ -214,116 +205,64 @@ rip_ctloutput(op, so, level, optname, m)
 	struct mbuf **m;
 {
 	register struct inpcb *inp = sotoinpcb(so);
-	int error = 0;
+#ifdef MROUTING
+	int error;
+#endif
 
 	if (level != IPPROTO_IP) {
-		error = ENOPROTOOPT;
-		if (op == PRCO_SETOPT && *m != 0)
-			(void) m_free(*m);
-	} else switch (op) {
-
-	case PRCO_SETOPT:
-		switch (optname) {
-		case IP_HDRINCL:
-			if (*m == 0 || (*m)->m_len < sizeof (int))
-				error = EINVAL;
-			else {
+		if (m != 0 && *m != 0)
+			(void)m_free(*m);
+		return (EINVAL);
+	}
+
+	switch (optname) {
+
+	case IP_HDRINCL:
+		if (op == PRCO_SETOPT || op == PRCO_GETOPT) {
+			if (m == 0 || *m == 0 || (*m)->m_len < sizeof (int))
+				return (EINVAL);
+			if (op == PRCO_SETOPT) {
 				if (*mtod(*m, int *))
 					inp->inp_flags |= INP_HDRINCL;
 				else
 					inp->inp_flags &= ~INP_HDRINCL;
+				(void)m_free(*m);
+			} else {
+				(*m)->m_len = sizeof (int);
+				*mtod(*m, int *) = inp->inp_flags & INP_HDRINCL;
 			}
-			if (*m != 0)
-				(void) m_free(*m);
-			break;
-
-#ifdef MROUTING
-		case MRT_INIT:
-		case MRT_DONE:
-		case MRT_ADD_VIF:
-		case MRT_DEL_VIF:
-		case MRT_ADD_MFC:
-		case MRT_DEL_MFC:
-		case MRT_ASSERT:
-			error = ip_mrouter_set(so, optname, m);
-			break;
-#endif
-
-		default:
-			error = ip_ctloutput(op, so, level, optname, m);
-			break;
+			return (0);
 		}
 		break;
 
-	case PRCO_GETOPT:
-		switch (optname) {
-		case IP_HDRINCL:
-			*m = m_get(M_WAIT, M_SOOPTS);
-			(*m)->m_len = sizeof (int);
-			*mtod(*m, int *) = inp->inp_flags & INP_HDRINCL ? 1 : 0;
-			break;
-
+	case MRT_INIT:
+	case MRT_DONE:
+	case MRT_ADD_VIF:
+	case MRT_DEL_VIF:
+	case MRT_ADD_MFC:
+	case MRT_DEL_MFC:
+	case MRT_VERSION:
+	case MRT_ASSERT:
 #ifdef MROUTING
-		case MRT_VERSION:
-		case MRT_ASSERT:
-			error = ip_mrouter_get(so, optname, m);
+		switch (op) {
+		case PRCO_SETOPT:
+			error = ip_mrouter_set(optname, so, m);
+			break;
+		case PRCO_GETOPT:
+			error = ip_mrouter_get(optname, so, m);
 			break;
-#endif
-
 		default:
-			error = ip_ctloutput(op, so, level, optname, m);
+			error = EINVAL;
 			break;
 		}
-		break;
+		return (error);
+#else
+		if (op == PRCO_SETOPT && *m)
+			m_free(*m);
+		return (EOPNOTSUPP);
+#endif
 	}
-	return (error);
-}
-
-int
-rip_bind(inp, nam)
-	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.tqh_first == 0)
-		return (EADDRNOTAVAIL);
-	if (addr->sin_family != AF_INET &&
-	    addr->sin_family != AF_IMPLINK)
-		return (EAFNOSUPPORT);
-	if (addr->sin_addr.s_addr != INADDR_ANY &&
-	    ifa_ifwithaddr(sintosa(addr)) == 0)
-		return (EADDRNOTAVAIL);
-	inp->inp_laddr = addr->sin_addr;
-	return (0);
-}
-
-int
-rip_connect(inp, nam)
-	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.tqh_first == 0)
-		return (EADDRNOTAVAIL);
-	if (addr->sin_family != AF_INET &&
-	    addr->sin_family != AF_IMPLINK)
-		return (EAFNOSUPPORT);
-	inp->inp_faddr = addr->sin_addr;
-	return (0);
-}
-
-void
-rip_disconnect(inp)
-	struct inpcb *inp;
-{
-
-	inp->inp_faddr.s_addr = INADDR_ANY;
+	return (ip_ctloutput(op, so, level, optname, m));
 }
 
 u_long	rip_sendspace = RIPSNDQ;
@@ -337,24 +276,16 @@ rip_usrreq(so, req, m, nam, control, p)
 	struct mbuf *m, *nam, *control;
 	struct proc *p;
 {
-	register struct inpcb *inp;
-	int s;
 	register int error = 0;
+	register struct inpcb *inp = sotoinpcb(so);
 #ifdef MROUTING
 	extern struct socket *ip_mrouter;
 #endif
-
 	if (req == PRU_CONTROL)
 		return (in_control(so, (long)m, (caddr_t)nam,
 		    (struct ifnet *)control, p));
 
-	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) {
+	if (inp == NULL && req != PRU_ATTACH) {
 		error = EINVAL;
 		goto release;
 	}
@@ -362,27 +293,31 @@ rip_usrreq(so, req, m, nam, control, p)
 	switch (req) {
 
 	case PRU_ATTACH:
-		if (inp != 0) {
-			error = EISCONN;
-			break;
-		}
+		if (inp)
+			panic("rip_attach");
 		if (p == 0 || (error = suser(p->p_ucred, &p->p_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)
+		if ((error = soreserve(so, rip_sendspace, rip_recvspace)) ||
+		    (error = in_pcballoc(so, &rawcbtable)))
 			break;
-		inp = sotoinpcb(so);
+		inp = (struct inpcb *)so->so_pcb;
 		inp->inp_ip.ip_p = (long)nam;
 		break;
 
+	case PRU_DISCONNECT:
+		if ((so->so_state & SS_ISCONNECTED) == 0) {
+			error = ENOTCONN;
+			break;
+		}
+		/* FALLTHROUGH */
+	case PRU_ABORT:
+		soisdisconnected(so);
+		/* FALLTHROUGH */
 	case PRU_DETACH:
+		if (inp == 0)
+			panic("rip_detach");
 #ifdef MROUTING
 		if (so == ip_mrouter)
 			ip_mrouter_done();
@@ -391,29 +326,50 @@ rip_usrreq(so, req, m, nam, control, p)
 		break;
 
 	case PRU_BIND:
-		error = rip_bind(inp, nam);
-		break;
+	    {
+		struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *);
 
-	case PRU_LISTEN:
-		error = EOPNOTSUPP;
+		if (nam->m_len != sizeof(*addr)) {
+			error = EINVAL;
+			break;
+		}
+		if ((ifnet.tqh_first == 0) ||
+		    ((addr->sin_family != AF_INET) &&
+		     (addr->sin_family != AF_IMPLINK)) ||
+		    (addr->sin_addr.s_addr &&
+		     ifa_ifwithaddr(sintosa(addr)) == 0)) {
+			error = EADDRNOTAVAIL;
+			break;
+		}
+		inp->inp_laddr = addr->sin_addr;
 		break;
-
+	    }
 	case PRU_CONNECT:
-		error = rip_connect(inp, nam);
-		if (error)
+	    {
+		struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *);
+
+		if (nam->m_len != sizeof(*addr)) {
+			error = EINVAL;
+			break;
+		}
+		if (ifnet.tqh_first == 0) {
+			error = EADDRNOTAVAIL;
 			break;
+		}
+		if ((addr->sin_family != AF_INET) &&
+		     (addr->sin_family != AF_IMPLINK)) {
+			error = EAFNOSUPPORT;
+			break;
+		}
+		inp->inp_faddr = addr->sin_addr;
 		soisconnected(so);
 		break;
+	    }
 
 	case PRU_CONNECT2:
 		error = EOPNOTSUPP;
 		break;
 
-	case PRU_DISCONNECT:
-		soisdisconnected(so);
-		rip_disconnect(inp);
-		break;
-
 	/*
 	 * Mark the connection as being incapable of further input.
 	 */
@@ -421,59 +377,46 @@ rip_usrreq(so, req, m, nam, control, p)
 		socantsendmore(so);
 		break;
 
-	case PRU_RCVD:
-		error = EOPNOTSUPP;
-		break;
-
 	/*
 	 * Ship a packet out.  The appropriate raw output
 	 * routine handles any massaging necessary.
 	 */
 	case PRU_SEND:
-		if (control && control->m_len) {
-			m_freem(control);
-			m_freem(m);
-			error = EINVAL;
-			break;
-		}
-	{
-		if (nam) {
-			if ((so->so_state & SS_ISCONNECTED) != 0) {
+	    {
+		register u_int32_t dst;
+
+		if (so->so_state & SS_ISCONNECTED) {
+			if (nam) {
 				error = EISCONN;
-				goto die;
-			}
-			error = rip_connect(inp, nam);
-			if (error) {
-			die:
-				m_freem(m);
 				break;
 			}
+			dst = inp->inp_faddr.s_addr;
 		} else {
-			if ((so->so_state & SS_ISCONNECTED) == 0) {
+			if (nam == NULL) {
 				error = ENOTCONN;
-				goto die;
+				break;
 			}
+			dst = mtod(nam, struct sockaddr_in *)->sin_addr.s_addr;
 		}
-		error = rip_output(m, inp);
-		if (nam)
-			rip_disconnect(inp);
-	}
+		error = rip_output(m, so, dst);
+		m = NULL;
 		break;
+	    }
 
 	case PRU_SENSE:
 		/*
 		 * stat: don't bother with a blocksize.
 		 */
-		splx(s);
 		return (0);
 
+	/*
+	 * Not supported.
+	 */
 	case PRU_RCVOOB:
-		error = EOPNOTSUPP;
-		break;
-
+	case PRU_RCVD:
+	case PRU_LISTEN:
+	case PRU_ACCEPT:
 	case PRU_SENDOOB:
-		m_freem(control);
-		m_freem(m);
 		error = EOPNOTSUPP;
 		break;
 
@@ -488,8 +431,8 @@ rip_usrreq(so, req, m, nam, control, p)
 	default:
 		panic("rip_usrreq");
 	}
-
 release:
-	splx(s);
+	if (m != NULL)
+		m_freem(m);
 	return (error);
 }