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.55.2.5
retrieving revision 1.57.4.1
diff -u -p -r1.55.2.5 -r1.57.4.1
--- src/sys/netinet/raw_ip.c	2002/08/27 23:48:03	1.55.2.5
+++ src/sys/netinet/raw_ip.c	2001/11/12 21:19:26	1.57.4.1
@@ -1,9 +1,9 @@
-/*	$NetBSD: raw_ip.c,v 1.55.2.5 2002/08/27 23:48:03 nathanw Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.57.4.1 2001/11/12 21:19:26 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
- *
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -15,7 +15,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- *
+ * 
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -64,9 +64,6 @@
  *	@(#)raw_ip.c	8.7 (Berkeley) 5/15/95
  */
 
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.55.2.5 2002/08/27 23:48:03 nathanw Exp $");
-
 #include "opt_ipsec.h"
 #include "opt_mrouting.h"
 
@@ -100,8 +97,6 @@ __KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1
 
 struct inpcbtable rawcbtable;
 
-int	 rip_pcbnotify __P((struct inpcbtable *, struct in_addr,
-    struct in_addr, int, int, void (*) __P((struct inpcb *, int))));
 int	 rip_bind __P((struct inpcb *, struct mbuf *));
 int	 rip_connect __P((struct inpcb *, struct mbuf *));
 void	 rip_disconnect __P((struct inpcb *));
@@ -163,11 +158,9 @@ rip_input(m, va_alist)
 
 	/*
 	 * XXX Compatibility: programs using raw IP expect ip_len
-	 * XXX to have the header length subtracted, and in host order.
-	 * XXX ip_off is also expected to be host order.
+	 * XXX to have the header length subtracted.
 	 */
-	ip->ip_len = ntohs(ip->ip_len) - (ip->ip_hl << 2);
-	NTOHS(ip->ip_off);
+	ip->ip_len -= ip->ip_hl << 2;
 
 	CIRCLEQ_FOREACH(inp, &rawcbtable.inpt_queue, inp_queue) {
 		if (inp->inp_ip.ip_p && inp->inp_ip.ip_p != proto)
@@ -237,67 +230,6 @@ rip_input(m, va_alist)
 	return;
 }
 
-int
-rip_pcbnotify(table, faddr, laddr, proto, errno, notify)
-	struct inpcbtable *table;
-	struct in_addr faddr, laddr;
-	int proto;
-	int errno;
-	void (*notify) __P((struct inpcb *, int));
-{
-	struct inpcb *inp, *ninp;
-	int nmatch;
-
-	nmatch = 0;
-	for (inp = CIRCLEQ_FIRST(&table->inpt_queue);
-	    inp != (struct inpcb *)&table->inpt_queue;
-	    inp = ninp) {
-		ninp = inp->inp_queue.cqe_next;
-		if (inp->inp_ip.ip_p && inp->inp_ip.ip_p != proto)
-			continue;
-		if (in_hosteq(inp->inp_faddr, faddr) &&
-		    in_hosteq(inp->inp_laddr, laddr)) {
-			(*notify)(inp, errno);
-			nmatch++;
-		}
-	}
-
-	return nmatch;
-}
-
-void *
-rip_ctlinput(cmd, sa, v)
-	int cmd;
-	struct sockaddr *sa;
-	void *v;
-{
-	struct ip *ip = v;
-	void (*notify) __P((struct inpcb *, int)) = in_rtchange;
-	int errno;
-
-	if (sa->sa_family != AF_INET ||
-	    sa->sa_len != sizeof(struct sockaddr_in))
-		return NULL;
-	if ((unsigned)cmd >= PRC_NCMDS)
-		return NULL;
-	errno = inetctlerrmap[cmd];
-	if (PRC_IS_REDIRECT(cmd))
-		notify = in_rtchange, ip = 0;
-	else if (cmd == PRC_HOSTDEAD)
-		ip = 0;
-	else if (errno == 0)
-		return NULL;
-	if (ip) {
-		rip_pcbnotify(&rawcbtable, satosin(sa)->sin_addr,
-		    ip->ip_src, ip->ip_p, errno, notify);
-
-		/* XXX mapped address case */
-	} else
-		in_pcbnotifyall(&rawcbtable, satosin(sa)->sin_addr, errno,
-		    notify);
-	return NULL;
-}
-
 /*
  * Generate IP header and pass packet to ip_output.
  * Tack on options user may have setup with control call.
@@ -337,9 +269,9 @@ rip_output(m, va_alist)
 		M_PREPEND(m, sizeof(struct ip), M_WAIT);
 		ip = mtod(m, struct ip *);
 		ip->ip_tos = 0;
-		ip->ip_off = htons(0);
+		ip->ip_off = 0;
 		ip->ip_p = inp->inp_ip.ip_p;
-		ip->ip_len = htons(m->m_pkthdr.len);
+		ip->ip_len = m->m_pkthdr.len;
 		ip->ip_src = inp->inp_laddr;
 		ip->ip_dst = inp->inp_faddr;
 		ip->ip_ttl = MAXTTL;
@@ -350,13 +282,10 @@ rip_output(m, va_alist)
 			return (EMSGSIZE);
 		}
 		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;
@@ -370,8 +299,7 @@ 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));
 }
 
 /*