From owner-p4-projects@FreeBSD.ORG  Thu Dec  7 15:23:00 2006
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 F24C316A58C; Thu,  7 Dec 2006 15:22:59 +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 B166F16A52D
	for <perforce@freebsd.org>; Thu,  7 Dec 2006 15:22:59 +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 3E74443FE3
	for <perforce@freebsd.org>; Thu,  7 Dec 2006 15:19:23 +0000 (GMT)
	(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 kB7FK7D5086689
	for <perforce@freebsd.org>; Thu, 7 Dec 2006 15:20:07 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB7FK70q086685
	for perforce@freebsd.org; Thu, 7 Dec 2006 15:20:07 GMT
	(envelope-from piso@freebsd.org)
Date: Thu, 7 Dec 2006 15:20:07 GMT
Message-Id: <200612071520.kB7FK70q086685@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 111246 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, 07 Dec 2006 15:23:00 -0000

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

Change 111246 by piso@piso_newluxor on 2006/12/07 15:19:58

	Backout change 111230.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#31 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#25 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#9 edit

Differences ...

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

@@ -3469,10 +3469,8 @@
 						((ipfw_insn_nat *)cmd)->nat = 
 							t;
 				}
-				if (m->m_pkthdr.len > MJUM16BYTES)
-					printf("fat pkt: %d\n", m->m_pkthdr.len);
-				if ((mcl = m_jumbo16pullup(m, 
-						m->m_pkthdr.len)) == NULL)
+				if ((mcl = m_megapullup(m, m->m_pkthdr.len)) ==
+				    NULL)
 					goto badnat;
 				ip = mtod(mcl, struct ip *);
 				if (args->eh == NULL) {
@@ -3536,10 +3534,10 @@
 				c = mtod(mcl, char *);
 				if (oif == NULL)
 					retval = LibAliasIn(t->lib, c, 
-							    MJUM16BYTES);
+							    MCLBYTES);
 				else
 					retval = LibAliasOut(t->lib, c, 
-							     MJUM16BYTES);
+							     MCLBYTES);
 				if (retval != PKT_ALIAS_OK) {
 					/* XXX - should i add some logging? */
 					m_free(mcl);

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

@@ -1656,29 +1656,4 @@
 	m_freem(m);
 	return (NULL);
 }
-
-struct mbuf *
-m_jumbo16pullup(struct mbuf *m, int len) {
-	struct mbuf *mcl;
-	caddr_t cp;
-	
-	if (len > MJUM16BYTES)
-		goto bad;
-	
-	if ((mcl = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, 
-			MJUM16BYTES)) == NULL)
-		goto bad;
- 
-	cp = mtod(mcl, caddr_t);
-	m_copydata(m, 0, len, cp);
-	m_move_pkthdr(mcl, m);
-	mcl->m_len = mcl->m_pkthdr.len;
-	m_freem(m);
- 
-	return (mcl);
-bad:
-	m_freem(m);
-	return (NULL);
-}
-
 #endif

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#9 (text+ko) ====

@@ -191,7 +191,6 @@
 
 /* Mbuf helper function. */
 struct mbuf    *m_megapullup(struct mbuf *, int);
-struct mbuf    *m_jumbo16pullup(struct mbuf *, int);
 
 /*
  * Mode flags and other constants.