From owner-p4-projects@FreeBSD.ORG  Tue Feb  6 17:36:56 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 27B7B16A402; Tue,  6 Feb 2007 17:36:55 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B0D7F16A405
	for <perforce@freebsd.org>; Tue,  6 Feb 2007 17:36:54 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id A1A6C13C48D
	for <perforce@freebsd.org>; Tue,  6 Feb 2007 17:36:54 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l16HasCD024582
	for <perforce@freebsd.org>; Tue, 6 Feb 2007 17:36:54 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l16HasU5024578
	for perforce@freebsd.org; Tue, 6 Feb 2007 17:36:54 GMT
	(envelope-from piso@freebsd.org)
Date: Tue, 6 Feb 2007 17:36:54 GMT
Message-Id: <200702061736.l16HasU5024578@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 114113 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 Feb 2007 17:36:56 -0000

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

Change 114113 by piso@piso_newluxor on 2007/02/06 17:36:34

	Libalias handles mbuf chain now, and the entire packet won't 
	lay anymore in the first mbuf, so stop assuming 
	m_pkthdr.len == m_len.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#9 edit
.. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#42 edit

Differences ...

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

@@ -247,7 +247,7 @@
 		return (ENOBUFS);
 	}
 	ip = mtod(m, struct ip *);
-	m->m_pkthdr.len = m->m_len = ntohs(ip->ip_len);
+	m->m_pkthdr.len = ntohs(ip->ip_len);
 
 	if ((ip->ip_off & htons(IP_OFFMASK)) == 0 &&
 	    ip->ip_p == IPPROTO_TCP) {		

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

@@ -3586,8 +3586,7 @@
 					goto badnat;
 				}
 				ip = mtod(m, struct ip *);
-				m->m_pkthdr.len = m->m_len = 
-				    ntohs(ip->ip_len);
+				m->m_pkthdr.len = ntohs(ip->ip_len);
 
 				/* 
 				 * XXX - libalias checksum offload