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.20
retrieving revision 1.24
diff -u -p -r1.20 -r1.24
--- src/sys/netinet/raw_ip.c	1995/06/12 00:47:49	1.20
+++ src/sys/netinet/raw_ip.c	1996/02/13 23:43:29	1.24
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip.c,v 1.20 1995/06/12 00:47:49 mycroft Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.24 1996/02/13 23:43:29 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1993
@@ -53,6 +53,9 @@
 #include <netinet/ip_var.h>
 #include <netinet/ip_mroute.h>
 #include <netinet/in_pcb.h>
+#include <netinet/in_var.h>
+
+#include <machine/stdarg.h>
 
 struct inpcbtable rawcbtable;
 
@@ -73,7 +76,7 @@ void
 rip_init()
 {
 
-	in_pcbinit(&rawcbtable);
+	in_pcbinit(&rawcbtable, 1);
 }
 
 struct	sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET };
@@ -83,16 +86,22 @@ struct	sockaddr_in ripsrc = { sizeof(rip
  * mbuf chain.
  */
 void
-rip_input(m)
+#if __STDC__
+rip_input(struct mbuf *m, ...)
+#else
+rip_input(m, va_alist)
 	struct mbuf *m;
+	va_dcl
+#endif
 {
 	register struct ip *ip = mtod(m, struct ip *);
 	register struct inpcb *inp;
 	struct socket *last = 0;
 
 	ripsrc.sin_addr = ip->ip_src;
-	for (inp = rawcbtable.inpt_list.lh_first; inp != 0;
-	    inp = inp->inp_list.le_next) {
+	for (inp = rawcbtable.inpt_queue.cqh_first;
+	    inp != (struct inpcb *)&rawcbtable.inpt_queue;
+	    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 &&
@@ -103,7 +112,7 @@ rip_input(m)
 			continue;
 		if (last) {
 			struct mbuf *n;
-			if (n = m_copy(m, 0, (int)M_COPYALL)) {
+			if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) {
 				if (sbappendaddr(&last->so_rcv,
 				    sintosa(&ripsrc), n,
 				    (struct mbuf *)0) == 0)
@@ -133,15 +142,29 @@ rip_input(m)
  * Tack on options user may have setup with control call.
  */
 int
-rip_output(m, so, dst)
-	register struct mbuf *m;
+#if __STDC__
+rip_output(struct mbuf *m, ...)
+#else
+rip_output(m, va_alist)
+	struct mbuf *m;
+	va_dcl
+#endif
+{
 	struct socket *so;
 	u_long dst;
-{
 	register struct ip *ip;
-	register struct inpcb *inp = sotoinpcb(so);
+	register struct inpcb *inp;
 	struct mbuf *opts;
-	int flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST;
+	int flags;
+	va_list ap;
+
+	va_start(ap, m);
+	so = va_arg(ap, struct socket *);
+	dst = va_arg(ap, u_long);
+	va_end(ap);
+
+	inp = sotoinpcb(so);
+	flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST;
 
 	/*
 	 * If the user handed us a complete IP packet, use it.
@@ -181,7 +204,6 @@ rip_ctloutput(op, so, level, optname, m)
 	struct mbuf **m;
 {
 	register struct inpcb *inp = sotoinpcb(so);
-	register int error;
 
 	if (level != IPPROTO_IP) {
 		if (m != 0 && *m != 0)
@@ -254,6 +276,15 @@ rip_usrreq(so, req, m, nam, control)
 #ifdef MROUTING
 	extern struct socket *ip_mrouter;
 #endif
+	if (req == PRU_CONTROL)
+		return (in_control(so, (long)m, (caddr_t)nam,
+			(struct ifnet *)control));
+
+	if (inp == NULL && req != PRU_ATTACH) {
+		error = EINVAL;
+		goto release;
+	}
+
 	switch (req) {
 
 	case PRU_ATTACH:
@@ -395,6 +426,7 @@ rip_usrreq(so, req, m, nam, control)
 	default:
 		panic("rip_usrreq");
 	}
+release:
 	if (m != NULL)
 		m_freem(m);
 	return (error);