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
retrieving revision 1.55.2.4
diff -u -p -r1.55 -r1.55.2.4
--- src/sys/netinet/raw_ip.c	2001/02/26 07:20:44	1.55
+++ src/sys/netinet/raw_ip.c	2002/06/20 03:48:53	1.55.2.4
@@ -1,9 +1,9 @@
-/*	$NetBSD: raw_ip.c,v 1.55 2001/02/26 07:20:44 itojun Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.55.2.4 2002/06/20 03:48:53 nathanw 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,6 +64,9 @@
  *	@(#)raw_ip.c	8.7 (Berkeley) 5/15/95
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.55.2.4 2002/06/20 03:48:53 nathanw Exp $");
+
 #include "opt_ipsec.h"
 #include "opt_mrouting.h"
 
@@ -97,6 +100,8 @@
 
 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 *));
@@ -162,9 +167,7 @@ rip_input(m, va_alist)
 	 */
 	ip->ip_len -= ip->ip_hl << 2;
 
-	for (inp = rawcbtable.inpt_queue.cqh_first;
-	    inp != (struct inpcb *)&rawcbtable.inpt_queue;
-	    inp = inp->inp_queue.cqe_next) {
+	CIRCLEQ_FOREACH(inp, &rawcbtable.inpt_queue, inp_queue) {
 		if (inp->inp_ip.ip_p && inp->inp_ip.ip_p != proto)
 			continue;
 		if (!in_nullhost(inp->inp_laddr) &&
@@ -232,6 +235,67 @@ 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.
@@ -389,7 +453,7 @@ rip_bind(inp, nam)
 
 	if (nam->m_len != sizeof(*addr))
 		return (EINVAL);
-	if (ifnet.tqh_first == 0)
+	if (TAILQ_FIRST(&ifnet) == 0)
 		return (EADDRNOTAVAIL);
 	if (addr->sin_family != AF_INET &&
 	    addr->sin_family != AF_IMPLINK)
@@ -410,7 +474,7 @@ rip_connect(inp, nam)
 
 	if (nam->m_len != sizeof(*addr))
 		return (EINVAL);
-	if (ifnet.tqh_first == 0)
+	if (TAILQ_FIRST(&ifnet) == 0)
 		return (EADDRNOTAVAIL);
 	if (addr->sin_family != AF_INET &&
 	    addr->sin_family != AF_IMPLINK)
@@ -450,6 +514,7 @@ rip_usrreq(so, req, m, nam, control, p)
 		    (struct ifnet *)control, p));
 
 	if (req == PRU_PURGEIF) {
+		in_pcbpurgeif0(&rawcbtable, (struct ifnet *)control);
 		in_purgeif((struct ifnet *)control);
 		in_pcbpurgeif(&rawcbtable, (struct ifnet *)control);
 		return (0);
@@ -487,13 +552,6 @@ rip_usrreq(so, req, m, nam, control, p)
 			break;
 		inp = sotoinpcb(so);
 		inp->inp_ip.ip_p = (long)nam;
-#ifdef IPSEC
-		error = ipsec_init_policy(so, &inp->inp_sp);
-		if (error != 0) {
-			in_pcbdetach(inp);
-			break;
-		}
-#endif /*IPSEC*/
 		break;
 
 	case PRU_DETACH: