From owner-p4-projects@FreeBSD.ORG  Sat Aug 29 09:22:57 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C82A1106566C; Sat, 29 Aug 2009 09:22:57 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 57F37106564A
	for <perforce@FreeBSD.org>; Sat, 29 Aug 2009 09:22:57 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 480928FC1C
	for <perforce@FreeBSD.org>; Sat, 29 Aug 2009 09:22:57 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7T9Mvxu077869
	for <perforce@FreeBSD.org>; Sat, 29 Aug 2009 09:22:57 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7T9Mvid077867
	for perforce@freebsd.org; Sat, 29 Aug 2009 09:22:57 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Sat, 29 Aug 2009 09:22:57 GMT
Message-Id: <200908290922.n7T9Mvid077867@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec <anchie@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 167950 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 29 Aug 2009 09:22:58 -0000

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

Change 167950 by anchie@anchie_malimis on 2009/08/29 09:22:09

	Additional check before tagging RS/RA messages.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#5 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#5 (text+ko) ====

@@ -508,20 +508,20 @@
 		*p = in6_cksum(m, ip6->ip6_nxt, sizeof(*ip6), plen);
 	}
 
-	/* Send RA/RS messages to user land for protection, before sending 
+	/* 
+	 * Send RA/RS messages to user land for protection, before sending 
 	 * them to rtadvd/rtsol.
 	 */
-	if (send_input_hook != NULL) {
+	if (send_input_hook != NULL && 
+		so->so_proto->pr_protocol == IPPROTO_ICMPV6) {
 		switch (type) {
 		case ND_ROUTER_ADVERT:
 		case ND_ROUTER_SOLICIT:
-			if (send_input_hook != NULL) {
-				mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, 
-					sizeof(unsigned short), M_NOWAIT);
-				if (mtag == NULL)
-					goto bad;
-				m_tag_prepend(m, mtag);
-			}
+			mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, 
+				sizeof(unsigned short), M_NOWAIT);
+			if (mtag == NULL)
+				goto bad;
+			m_tag_prepend(m, mtag);
 		}
 	}