From owner-p4-projects@FreeBSD.ORG  Wed Jan 31 21:26:38 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 277CA16A408; Wed, 31 Jan 2007 21:26:38 +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 02F5A16A406
	for <perforce@freebsd.org>; Wed, 31 Jan 2007 21:26:38 +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 E89C013C461
	for <perforce@freebsd.org>; Wed, 31 Jan 2007 21:26:37 +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 l0VLQbUs033441
	for <perforce@freebsd.org>; Wed, 31 Jan 2007 21:26:37 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0VLQbUY033438
	for perforce@freebsd.org; Wed, 31 Jan 2007 21:26:37 GMT
	(envelope-from piso@freebsd.org)
Date: Wed, 31 Jan 2007 21:26:37 GMT
Message-Id: <200701312126.l0VLQbUY033438@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 113795 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, 31 Jan 2007 21:26:38 -0000

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

Change 113795 by piso@piso_newluxor on 2007/01/31 21:26:33

	Revert previous modifications to Fragment[In|Out] too:
	as they are only called from LibAlias[In|Out]Locked() and need just a contiguos
	ip hdr, we can safely hand them a "struct ip *" (as the actual ip hdr pullup
	is done in LibAlias[In|Out]Locked() - see previous commit).

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#47 edit

Differences ...

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

@@ -1146,21 +1146,14 @@
 */
 
 /* Local prototypes */
-static int	FragmentIn(struct libalias *, void *);
-static int	FragmentOut(struct libalias *, void *);
+static int	FragmentIn(struct libalias *, struct ip *);
+static int	FragmentOut(struct libalias *, struct ip *);
 
 
 static int
-FragmentIn(struct libalias *la, void *ptr)
+FragmentIn(struct libalias *la, struct ip *pip)
 {
 	struct alias_link *lnk;
-	struct ip *pip;
-#ifdef _KERNEL
-	// XXX - m_pullup()
-	pip = ptr;
-#else
-	pip = ptr;
-#endif
 
 	LIBALIAS_LOCK_ASSERT(la);
 	lnk = FindFragmentIn2(la, pip->ip_src, pip->ip_dst, pip->ip_id);
@@ -1179,16 +1172,9 @@
 
 
 static int
-FragmentOut(struct libalias *la, void *ptr)
+FragmentOut(struct libalias *la, struct ip *pip)
 {
-	struct ip *pip;
 	struct in_addr alias_address;
-#ifdef _KERNEL
-	// XXX m_pullup()
-	pip = ptr;
-#else
-	pip = ptr;
-#endif
 
 	LIBALIAS_LOCK_ASSERT(la);
 	alias_address = FindAliasAddress(la, pip->ip_src);