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.6
retrieving revision 1.9
diff -u -p -r1.6 -r1.9
--- src/sys/netinet/raw_ip.c	1993/12/06 04:59:44	1.6
+++ src/sys/netinet/raw_ip.c	1994/01/09 01:06:21	1.9
@@ -31,39 +31,41 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)raw_ip.c	7.8 (Berkeley) 7/25/90
- *	$Id: raw_ip.c,v 1.6 1993/12/06 04:59:44 hpeyerl Exp $
+ *	$Id: raw_ip.c,v 1.9 1994/01/09 01:06:21 mycroft Exp $
  */
 
-#include "param.h"
-#include "malloc.h"
-#include "mbuf.h"
-#include "socket.h"
-#include "protosw.h"
-#include "socketvar.h"
-#include "errno.h"
-
-#include "../net/if.h"
-#include "../net/route.h"
-#include "../net/raw_cb.h"
-
-#include "in.h"
-#include "in_systm.h"
-#include "ip.h"
-#include "ip_var.h"
-#include "in_pcb.h"
+#include <sys/param.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+#include <sys/protosw.h>
+#include <sys/socketvar.h>
+#include <sys/errno.h>
+
+#include <net/if.h>
+#include <net/route.h>
+#include <net/raw_cb.h>
+
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/ip_var.h>
+#include <netinet/in_pcb.h>
+#include <netinet/ip_mroute.h>
 
 /*
  * Raw interface to IP protocol.
  */
-
 struct	sockaddr_in ripdst = { sizeof(ripdst), AF_INET };
 struct	sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET };
 struct	sockproto ripproto = { PF_INET };
+
 /*
  * Setup generic address and protocol structures
  * for raw_input routine, then pass them along with
  * mbuf chain.
  */
+void
 rip_input(m)
 	struct mbuf *m;
 {
@@ -84,6 +86,7 @@ rip_input(m)
  * Tack on options user may have setup with control call.
  */
 #define	satosin(sa)	((struct sockaddr_in *)(sa))
+int
 rip_output(m, so)
 	register struct mbuf *m;
 	struct socket *so;
@@ -118,7 +121,7 @@ rip_output(m, so)
 	}
 	return (ip_output(m,
 	   (rp->rinp_flags & RINPF_HDRINCL)? (struct mbuf *)0: rp->rinp_options,
-	    &rp->rinp_route, 
+	    &rp->rinp_route,
 	   (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST
 #ifdef MULTICAST
 		| IP_MULTICASTOPTS, rp->rinp_rcb.rcb_moptions
@@ -129,6 +132,7 @@ rip_output(m, so)
 /*
  * Raw IP socket option processing.
  */
+int
 rip_ctloutput(op, so, level, optname, m)
 	int op;
 	struct socket *so;
@@ -205,9 +209,9 @@ rip_ctloutput(op, so, level, optname, m)
 		case IP_MULTICAST_LOOP:
 		case IP_ADD_MEMBERSHIP:
 		case IP_DROP_MEMBERSHIP:
-			error = ip_getmoptions(optname, 
-						rp->rinp_rcb.rcb_moptions, m);
-                      break;
+			error = ip_getmoptions(optname,
+			    rp->rinp_rcb.rcb_moptions, m);
+			break;
 #endif
 		default:
 			error = EINVAL;
@@ -223,6 +227,7 @@ rip_ctloutput(op, so, level, optname, m)
 }
 
 /*ARGSUSED*/
+int
 rip_usrreq(so, req, m, nam, control)
 	register struct socket *so;
 	int req;