From owner-p4-projects@FreeBSD.ORG  Thu Jul  2 09:27:46 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 02D5D1065674; Thu,  2 Jul 2009 09:27:46 +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 B6CD3106564A
	for <perforce@FreeBSD.org>; Thu,  2 Jul 2009 09:27:45 +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 A50828FC12
	for <perforce@FreeBSD.org>; Thu,  2 Jul 2009 09:27:45 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n629RjPK066377
	for <perforce@FreeBSD.org>; Thu, 2 Jul 2009 09:27:45 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n629RjAq066375
	for perforce@freebsd.org; Thu, 2 Jul 2009 09:27:45 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Thu, 2 Jul 2009 09:27:45 GMT
Message-Id: <200907020927.n629RjAq066375@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 165536 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: Thu, 02 Jul 2009 09:27:46 -0000

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

Change 165536 by anchie@anchie_malimis on 2009/07/02 09:27:24

	Return IPPROTO_DONE after sending the incoming packet to the user space.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#14 edit

Differences ...

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

@@ -766,18 +766,20 @@
 			/* give up local */
 
 			/* Send incoming SeND-protected/ND packet to user space. */
-			if (send_output_hook != NULL)
+			if (send_output_hook != NULL) {
 				send_output_hook(m, ifp, SND_IN, ip6len);
-			else {
+				return (IPPROTO_DONE);
+			} else {
 				/* give up local */
 				nd6_rs_input(m, off, icmp6len);
 			}
 			m = NULL;
 			goto freeit;
 		}
-		if (send_output_hook != NULL)
+		if (send_output_hook != NULL) {
 			send_output_hook(n, ifp, SND_IN, ip6len);
-		else
+			return (IPPROTO_DONE);
+		} else
 			nd6_rs_input(n, off, icmp6len);
 		/* m stays. */
 		break;
@@ -791,16 +793,18 @@
 		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 
 			/* Send incoming SeND-protected/ND packet to user space. */
-			if (send_output_hook != NULL)
+			if (send_output_hook != NULL) {
 				send_output_hook(m, ifp, SND_IN, ip6len);
-			else
+				return (IPPROTO_DONE);
+			} else
 				nd6_ra_input(m, off, icmp6len);
 			m = NULL;
 			goto freeit;
 		}
-		if (send_output_hook != NULL)
+		if (send_output_hook != NULL) {
 			send_output_hoo(n, ifp, SND_IN, ip6len);
-		else
+			return (IPPROTO_DONE);
+		} else
 			nd6_ra_input(n, off, icmp6len);
 		/* m stays. */
 		break;
@@ -814,18 +818,20 @@
 		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 
 			/* Send incoming SeND-protected/ND packet to user space. */
-			if (send_output_hook != NULL)
+			if (send_output_hook != NULL) {
 				send_output_hook(m, ifp, SND_IN, ip6len);
-			else {
+				return (IPPROTO_DONE);
+			} else {
 				/* give up local */
 				nd6_ns_input(m, off, icmp6len);
 			}
 			m = NULL;
 			goto freeit;
 		}
-		if (send_output_hook != NULL)
+		if (send_output_hook != NULL) {
 			send_output_hook(n, ifp, SND_IN, ip6len);
-		else
+			return (IPPROTO_DONE);
+		} else
 			nd6_ns_input(n, off, icmp6len);
 		/* m stays. */
 		break;
@@ -839,9 +845,10 @@
 		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 
 			/* Send incoming SeND-protected/ND packet to user space. */
-			if (send_output_hook != NULL)
+			if (send_output_hook != NULL) {
 				send_output_hook(m, ifp, SND_IN, ip6len);
-			else {
+				return (IPPROTO_DONE);
+			} else {
 				/* give up local */
 				nd6_na_input(m, off, icmp6len);
 			}
@@ -864,18 +871,20 @@
 		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
 
 			/* Send incoming SeND-protected/ND packet to user space. */
-			if (send_output_hook != NULL)
+			if (send_output_hook != NULL) {
 				send_output_hook(m, ifp, SND_IN, ip6len);
-			else {
+				return (IPPROTO_DONE);
+			} else {
 				/* give up local */
 				icmp6_redirect_input(m, off);
 			}
 			m = NULL;
 			goto freeit;
 		}
-		if (send_output_hook != NULL)
+		if (send_output_hook != NULL) {
 			send_output_hook(n, ifp, SND_IN, ip6len);
-		else
+			return (IPPROTO_DONE);
+		} else
 			icmp6_redirect_input(n, off);
 		/* m stays. */
 		break;