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.61
retrieving revision 1.68
diff -u -p -r1.61 -r1.68
--- src/sys/netinet/raw_ip.c	2002/06/09 16:33:43	1.61
+++ src/sys/netinet/raw_ip.c	2003/05/27 22:36:38	1.68
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip.c,v 1.61 2002/06/09 16:33:43 itojun Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.68 2003/05/27 22:36:38 itojun 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.61 2002/06/09 16:33:43 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.68 2003/05/27 22:36:38 itojun Exp $");
 
 #include "opt_ipsec.h"
 #include "opt_mrouting.h"
@@ -126,8 +126,6 @@ rip_init()
 	in_pcbinit(&rawcbtable, 1, 1);
 }
 
-static struct	sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET };
-
 /*
  * Setup generic address and protocol structures
  * for raw_input routine, then pass them along with
@@ -142,7 +140,7 @@ rip_input(m, va_alist)
 	va_dcl
 #endif
 {
-	int off, proto;
+	int proto;
 	struct ip *ip = mtod(m, struct ip *);
 	struct inpcb *inp;
 	struct inpcb *last = 0;
@@ -151,7 +149,7 @@ rip_input(m, va_alist)
 	va_list ap;
 
 	va_start(ap, m);
-	off = va_arg(ap, int);
+	(void)va_arg(ap, int);		/* ignore value, advance ap */
 	proto = va_arg(ap, int);
 	va_end(ap);
 
@@ -163,9 +161,11 @@ rip_input(m, va_alist)
 
 	/*
 	 * XXX Compatibility: programs using raw IP expect ip_len
-	 * XXX to have the header length subtracted.
+	 * XXX to have the header length subtracted, and in host order.
+	 * XXX ip_off is also expected to be host order.
 	 */
-	ip->ip_len -= ip->ip_hl << 2;
+	ip->ip_len = ntohs(ip->ip_len) - (ip->ip_hl << 2);
+	NTOHS(ip->ip_off);
 
 	CIRCLEQ_FOREACH(inp, &rawcbtable.inpt_queue, inp_queue) {
 		if (inp->inp_ip.ip_p && inp->inp_ip.ip_p != proto)
@@ -332,12 +332,14 @@ rip_output(m, va_alist)
 			m_freem(m);
 			return (EMSGSIZE);
 		}
-		M_PREPEND(m, sizeof(struct ip), M_WAIT);
+		M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
+		if (!m)
+			return (ENOBUFS);
 		ip = mtod(m, struct ip *);
 		ip->ip_tos = 0;
-		ip->ip_off = 0;
+		ip->ip_off = htons(0);
 		ip->ip_p = inp->inp_ip.ip_p;
-		ip->ip_len = m->m_pkthdr.len;
+		ip->ip_len = htons(m->m_pkthdr.len);
 		ip->ip_src = inp->inp_laddr;
 		ip->ip_dst = inp->inp_faddr;
 		ip->ip_ttl = MAXTTL;
@@ -348,10 +350,28 @@ rip_output(m, va_alist)
 			return (EMSGSIZE);
 		}
 		ip = mtod(m, struct ip *);
+
+		/*
+		 * If the mbuf is read-only, we need to allocate
+		 * a new mbuf for the header, since we need to
+		 * modify the header.
+		 */
+		if (M_READONLY(m)) {
+			int hlen = ip->ip_hl << 2;
+
+			m = m_copyup(m, hlen, (max_linkhdr + 3) & ~3);
+			if (m == NULL)
+				return (ENOMEM);	/* XXX */
+			ip = mtod(m, struct ip *);
+		}
+
+		/* XXX userland passes ip_len and ip_off in host order */
 		if (m->m_pkthdr.len != ip->ip_len) {
 			m_freem(m);
 			return (EINVAL);
 		}
+		HTONS(ip->ip_len);
+		HTONS(ip->ip_off);
 		if (ip->ip_id == 0)
 			ip->ip_id = htons(ip_id++);
 		opts = NULL;
@@ -365,7 +385,8 @@ rip_output(m, va_alist)
 		return ENOBUFS;
 	}
 #endif /*IPSEC*/
-	return (ip_output(m, opts, &inp->inp_route, flags, inp->inp_moptions, &inp->inp_errormtu));
+	return (ip_output(m, opts, &inp->inp_route, flags, inp->inp_moptions,
+	    &inp->inp_errormtu));
 }
 
 /*
@@ -423,7 +444,8 @@ rip_ctloutput(op, so, level, optname, m)
 	case PRCO_GETOPT:
 		switch (optname) {
 		case IP_HDRINCL:
-			*m = m_get(M_WAIT, M_SOOPTS);
+			*m = m_get(M_WAIT, MT_SOOPTS);
+			MCLAIM((*m), so->so_mowner);
 			(*m)->m_len = sizeof (int);
 			*mtod(*m, int *) = inp->inp_flags & INP_HDRINCL ? 1 : 0;
 			break;