From owner-p4-projects@FreeBSD.ORG  Sun Mar 23 21:03:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B221D1065681; Sun, 23 Mar 2008 21:03:20 +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 716FD1065678
	for <perforce@freebsd.org>; Sun, 23 Mar 2008 21:03:20 +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 5B5E18FC20
	for <perforce@freebsd.org>; Sun, 23 Mar 2008 21:03:20 +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 m2NL3Kjf028329
	for <perforce@freebsd.org>; Sun, 23 Mar 2008 21:03:20 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NL3KGg028327
	for perforce@freebsd.org; Sun, 23 Mar 2008 21:03:20 GMT
	(envelope-from piso@freebsd.org)
Date: Sun, 23 Mar 2008 21:03:20 GMT
Message-Id: <200803232103.m2NL3KGg028327@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 138389 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: Sun, 23 Mar 2008 21:03:21 -0000

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

Change 138389 by piso@piso_newluxor on 2008/03/23 21:02:53

	Convert LibaliasFragmentIn() to use mbuf while in kernel.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#71 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#19 edit

Differences ...

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

@@ -1197,12 +1197,11 @@
 	return (fptr);
 }
 
-// XXX ip free
 void
-LibAliasFragmentIn(struct libalias *la, char *ptr,	/* Points to correctly
+LibAliasFragmentIn(struct libalias *la, pkt_t ptr,	/* Points to correctly
 							 * de-aliased header
 							 * fragment */
-    char *ptr_fragment		/* Points to fragment which must be
+    pkt_t ptr_fragment		/* Points to fragment which must be
 				 * de-aliased   */
 )
 {
@@ -1211,8 +1210,8 @@
 
 	LIBALIAS_LOCK(la);
 	(void)la;
-	pip = (struct ip *)ptr;
-	fpip = (struct ip *)ptr_fragment;
+	PULLUP_IPHDR(pip, ptr);
+	PULLUP_IPHDR(fpip, ptr_fragment);
 
 	DifferentialChecksum(&fpip->ip_sum,
 	    &pip->ip_dst, &fpip->ip_dst, 2);

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

@@ -138,11 +138,14 @@
     unsigned char _proto);
 
 /* Fragment Handling functions. */
-void		LibAliasFragmentIn(struct libalias *, char *_ptr, char *_ptr_fragment);
 #ifdef _KERNEL
+void		LibAliasFragmentIn(struct libalias *, struct mbuf **_ptr,
+    struct mbuf **_ptr_fragment);
 struct mbuf    *LibAliasGetFragment(struct libalias *, struct mbuf **_ptr);
 int		LibAliasSaveFragment(struct libalias *, struct mbuf **_ptr);
 #else
+void		LibAliasFragmentIn(struct libalias *, char *_ptr, 
+    char *_ptr_fragment);
 char           *LibAliasGetFragment(struct libalias *, char *_ptr);
 int		LibAliasSaveFragment(struct libalias *, char *_ptr);
 #endif