From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 00:19:19 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BF4941065674; Wed, 26 Mar 2008 00:19:18 +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 7F6B6106564A
	for <perforce@freebsd.org>; Wed, 26 Mar 2008 00:19:18 +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 4C7458FC14
	for <perforce@freebsd.org>; Wed, 26 Mar 2008 00:19:18 +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 m2Q0JId1034548
	for <perforce@freebsd.org>; Wed, 26 Mar 2008 00:19:18 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2Q0JIJ1034546
	for perforce@freebsd.org; Wed, 26 Mar 2008 00:19:18 GMT
	(envelope-from piso@freebsd.org)
Date: Wed, 26 Mar 2008 00:19:18 GMT
Message-Id: <200803260019.m2Q0JIJ1034546@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 138571 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: Wed, 26 Mar 2008 00:19:19 -0000

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

Change 138571 by piso@piso_newluxor on 2008/03/26 00:18:17

	Adapt ipfw_nat to the new libalias API. 

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#2 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#2 (text+ko) ====

@@ -253,7 +253,7 @@
 
 	ldt = 0;
 	retval = 0;
-	if ((mcl = m_megapullup(m, m->m_pkthdr.len)) ==
+	if ((mcl = m_pullup(m, sizeof(struct ip))) ==
 	    NULL)
 		goto badnat;
 	ip = mtod(mcl, struct ip *);
@@ -317,10 +317,10 @@
 
 	c = mtod(mcl, char *);
 	if (args->oif == NULL)
-		retval = LibAliasIn(t->lib, c, 
+		retval = LibAliasIn(t->lib, &mcl, 
 				    MCLBYTES);
 	else
-		retval = LibAliasOut(t->lib, c, 
+		retval = LibAliasOut(t->lib, &mcl, 
 				     MCLBYTES);
 	if (retval != PKT_ALIAS_OK) {
 		/* XXX - should i add some logging? */