PERFORCE change 113794 for review

[Paolo Pisati]

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

Change 113794 by piso at piso_newluxor on 2007/01/31 21:17:15

	In kernel libalias will grok mbuf instead of char * data.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#46 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#11 edit

Differences ...

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

@@ -1290,7 +1290,11 @@
 		  int maxpacketsize);
 
 int
+#ifdef _KERNEL
+LibAliasIn(struct libalias *la, struct mbuf *ptr, int maxpacketsize)
+#else
 LibAliasIn(struct libalias *la, char *ptr, int maxpacketsize)
+#endif
 {
 	int res;
 
@@ -1409,7 +1413,11 @@
 #define UNREG_ADDR_C_UPPER 0xc0a8ffff
 
 int
+#ifdef _KERNEL
+LibAliasOut(struct libalias *la, struct mbuf *ptr, int maxpacketsize)
+#else
 LibAliasOut(struct libalias *la, char *ptr, int maxpacketsize)
+#endif
 {
 	int res;
 
@@ -1420,7 +1428,11 @@
 }
 
 int
+#ifdef _KERNEL
+LibAliasOutTry(struct libalias *la, struct mbuf *ptr, int maxpacketsize, int create)
+#else
 LibAliasOutTry(struct libalias *la, char *ptr, int maxpacketsize, int create)
+#endif
 {
 	int res;
 

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

@@ -145,9 +145,15 @@
 void		LibAliasUninit(struct libalias *);
 
 /* Packet Handling functions. */
+#ifdef _KERNEL
+int		LibAliasIn (struct libalias *, struct mbuf *_ptr, int _maxpacketsize);
+int		LibAliasOut(struct libalias *, struct mbuf *_ptr, int _maxpacketsize);
+int		LibAliasOutTry(struct libalias *, struct mbuf *_ptr, int _maxpacketsize, int _create);
+#else
 int		LibAliasIn (struct libalias *, char *_ptr, int _maxpacketsize);
 int		LibAliasOut(struct libalias *, char *_ptr, int _maxpacketsize);
 int		LibAliasOutTry(struct libalias *, char *_ptr, int _maxpacketsize, int _create);
+#endif
 int		LibAliasUnaliasOut(struct libalias *, char *_ptr, int _maxpacketsize);
 
 /* Port and address redirection functions. */