From owner-p4-projects@FreeBSD.ORG  Thu Nov  6 16:35:26 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B5C7716A4D0; Thu,  6 Nov 2003 16:35:25 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 91A2616A4CE
	for <perforce@freebsd.org>; Thu,  6 Nov 2003 16:35:25 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1623343FCB
	for <perforce@freebsd.org>; Thu,  6 Nov 2003 16:35:25 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA70ZOXJ076925
	for <perforce@freebsd.org>; Thu, 6 Nov 2003 16:35:24 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA70ZOLX076922
	for perforce@freebsd.org; Thu, 6 Nov 2003 16:35:24 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Thu, 6 Nov 2003 16:35:24 -0800 (PST)
Message-Id: <200311070035.hA70ZOLX076922@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 41603 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Nov 2003 00:35:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=41603

Change 41603 by sam@sam_ebb on 2003/11/06 16:35:10

	Add ICMP redirect handling to divert sockets.  It's not clear
	this is needed but it was simple so I did it.

Affected files ...

.. //depot/projects/netperf/sys/netinet/in_proto.c#5 edit
.. //depot/projects/netperf/sys/netinet/ip_divert.c#13 edit
.. //depot/projects/netperf/sys/netinet/ip_var.h#10 edit

Differences ...

==== //depot/projects/netperf/sys/netinet/in_proto.c#5 (text+ko) ====

@@ -206,7 +206,7 @@
 #endif
 #ifdef IPDIVERT
 { SOCK_RAW,	&inetdomain,	IPPROTO_DIVERT,	PR_ATOMIC|PR_ADDR,
-  div_input,	0,	 	0,		ip_ctloutput,
+  div_input,	0,	 	div_ctlinput,	ip_ctloutput,
   0,
   div_init,	0,		0,		0,
   &div_usrreqs,

==== //depot/projects/netperf/sys/netinet/ip_divert.c#13 (text+ko) ====

@@ -518,6 +518,21 @@
 	return div_output(so, m, (struct sockaddr_in *)nam, control);
 }
 
+void
+div_ctlinput(int cmd, struct sockaddr *sa, void *vip)
+{
+        struct in_addr faddr;
+
+	faddr = ((struct sockaddr_in *)sa)->sin_addr;
+	if (sa->sa_family != AF_INET || faddr.s_addr == INADDR_ANY)
+        	return;
+	if (PRC_IS_REDIRECT(cmd)) {
+		/* flush held routes */
+		in_pcbnotifyall(&divcbinfo, faddr,
+			inetctlerrmap[cmd], in_rtchange);
+	}
+}
+
 static int
 div_pcblist(SYSCTL_HANDLER_ARGS)
 {

==== //depot/projects/netperf/sys/netinet/ip_var.h#10 (text+ko) ====

@@ -203,6 +203,7 @@
 #ifdef IPDIVERT
 void	div_init(void);
 void	div_input(struct mbuf *, int);
+void	div_ctlinput(int, struct sockaddr *, void *);
 void	divert_packet(struct mbuf *m, int incoming, int port, int rule);
 extern struct pr_usrreqs div_usrreqs;
 #endif