PERFORCE change 138389 for review

[Paolo Pisati]

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

Change 138389 by piso at 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