From owner-p4-projects@FreeBSD.ORG  Tue Nov  6 21:18:35 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4477216A419; Tue,  6 Nov 2007 21:18:35 +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 EC77816A417
	for <perforce@freebsd.org>; Tue,  6 Nov 2007 21:18:34 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DF1A813C4A3
	for <perforce@freebsd.org>; Tue,  6 Nov 2007 21:18:34 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA6LIY7u029237
	for <perforce@freebsd.org>; Tue, 6 Nov 2007 21:18:34 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA6LIYee029234
	for perforce@freebsd.org; Tue, 6 Nov 2007 21:18:34 GMT
	(envelope-from piso@freebsd.org)
Date: Tue, 6 Nov 2007 21:18:34 GMT
Message-Id: <200711062118.lA6LIYee029234@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 128750 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: Tue, 06 Nov 2007 21:18:35 -0000

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

Change 128750 by piso@piso_newluxor on 2007/11/06 21:17:58

	Libalias now modifies the input mbuf, thus we have to put it back 
	into netgraph's item.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#12 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#12 (text+ko) ====

@@ -284,12 +284,14 @@
 		rval = LibAliasIn(priv->lib, &m, 0);
 		if (rval != PKT_ALIAS_OK &&
 		    rval != PKT_ALIAS_FOUND_HEADER_FRAGMENT) {
+			NGI_M(item) = m;
 			NG_FREE_ITEM(item);
 			return (EINVAL);
 		}
 	} else if (hook == priv->out) {
 		rval = LibAliasOut(priv->lib, &m, 0);
 		if (rval != PKT_ALIAS_OK) {
+			NGI_M(item) = m;
 			NG_FREE_ITEM(item);
 			return (EINVAL);
 		}
@@ -355,7 +357,7 @@
 			ip->ip_len = htons(ip->ip_len);
 		}
 	}
-
+	NGI_M(item) = m;
 send:
 	if (hook == priv->in)
 		NG_FWD_ITEM_HOOK(error, item, priv->out);