Play with includes so that libalias can be compiled both as userland

library and kernel module.
svn path=/head/; revision=145921
2025-01-13 14:40:22 +00:00 · 2005-05-05 19:27:32 +00:00 · 2005-05-05 19:27:32 +00:00 · c649a2e033 · 2020-12-20 02:59:44 +00:00
commit c649a2e033
parent 2891ace6c8
12 changed files with 159 additions and 33 deletions
--- a/sys/netinet/libalias/alias.c
+++ b/sys/netinet/libalias/alias.c
@ -111,7 +111,12 @@ __FBSDID("$FreeBSD$");
    See HISTORY file for additional revisions.
 */

+#ifdef _KERNEL
+#include <sys/param.h>
+#else
 #include <sys/types.h>
+#include <stdio.h>
+#endif

 #include <netinet/in_systm.h>
 #include <netinet/in.h>
@ -120,10 +125,13 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp.h>
 #include <netinet/udp.h>

-#include <stdio.h>
-
+#ifdef _KERNEL
+#include <netinet/libalias/alias_local.h>
+#include <netinet/libalias/alias.h>
+#else
 #include "alias_local.h"
 #include "alias.h"
+#endif

 #define NETBIOS_NS_PORT_NUMBER 137
 #define NETBIOS_DGM_PORT_NUMBER 138
--- a/sys/netinet/libalias/alias_cuseeme.c
+++ b/sys/netinet/libalias/alias_cuseeme.c
@ -29,14 +29,24 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include <stdio.h>
+#ifdef _KERNEL
+#include <sys/param.h>
+#else
 #include <sys/types.h>
+#include <stdio.h>
+#endif
+
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/udp.h>

+#ifdef _KERNEL
+#include <netinet/libalias/alias_local.h>
+#include <netinet/libalias/alias.h>
+#else
 #include "alias_local.h"
+#endif

 /* CU-SeeMe Data Header */
 struct cu_header {
--- a/sys/netinet/libalias/alias_db.c
+++ b/sys/netinet/libalias/alias_db.c
@ -142,28 +142,42 @@ __FBSDID("$FreeBSD$");
    See HISTORY file for additional revisions.
 */

+#ifdef _KERNEL
+#include <sys/param.h>
+#else
+#include <sys/types.h>
+#endif

-/* System include files */
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-
+#include <sys/errno.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <sys/types.h>
+
+#ifdef _KERNEL
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#else 
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h> 
+#include <arpa/inet.h>
+#endif

 /* BSD network include files */
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include <arpa/inet.h>

+#ifdef _KERNEL  
+#include <netinet/libalias/alias.h>
+#include <netinet/libalias/alias_local.h>
+#else
 #include "alias.h"
 #include "alias_local.h"
-
+#endif

 static		LIST_HEAD(, libalias) instancehead = LIST_HEAD_INITIALIZER(instancehead);

--- a/sys/netinet/libalias/alias_ftp.c
+++ b/sys/netinet/libalias/alias_ftp.c
@ -69,16 +69,28 @@ __FBSDID("$FreeBSD$");
 */

 /* Includes */
+#ifdef _KERNEL
+#include <sys/param.h>
+#include <sys/ctype.h>
+#include <sys/libkern.h>
+#else
+#include <sys/types.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/types.h>
+#endif
+
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>

+#ifdef _KERNEL
+#include <netinet/libalias/alias_local.h>
+#include <netinet/libalias/alias.h>
+#else
 #include "alias_local.h"
+#endif

 #define FTP_CONTROL_PORT_NUMBER 21
 #define MAX_MESSAGE_SIZE	128
--- a/sys/netinet/libalias/alias_irc.c
+++ b/sys/netinet/libalias/alias_irc.c
@ -48,17 +48,30 @@ __FBSDID("$FreeBSD$");
 */

 /* Includes */
+#ifdef _KERNEL
+#include <sys/param.h>
+#include <sys/libkern.h>
+#include <sys/ctype.h>
+#include <sys/limits.h>
+#else
+#include <sys/types.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/types.h>
+#include <limits.h>
+#endif
+
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include <limits.h>

+#ifdef _KERNEL
+#include <netinet/libalias/alias_local.h>
+#include <netinet/libalias/alias.h>
+#else
 #include "alias_local.h"
+#endif

 /* Local defines */
 #define DBprintf(a)
--- a/sys/netinet/libalias/alias_nbt.c
+++ b/sys/netinet/libalias/alias_nbt.c
@ -41,18 +41,29 @@ __FBSDID("$FreeBSD$");
 */

 /* Includes */
+#ifdef _KERNEL
+#include <sys/param.h>
+#include <sys/ctype.h>
+#include <sys/libkern.h>
+#else
+#include <sys/types.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/types.h>
+#include <arpa/inet.h>
+#endif
+
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 #include <netinet/tcp.h>

+#ifdef _KERNEL
+#include <netinet/libalias/alias_local.h>
+#else
 #include "alias_local.h"
+#endif

 typedef struct {
 	struct in_addr	oldaddr;
--- a/sys/netinet/libalias/alias_old.c
+++ b/sys/netinet/libalias/alias_old.c
@ -27,10 +27,20 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

-#include <stdlib.h>
+#ifdef _KERNEL
+#include <sys/param.h>
+#else
 #include <sys/types.h>
+#include <stdlib.h>
+#endif
+
 #include <netinet/in.h>
+
+#ifdef _KERNEL
+#include <netinet/libalias/alias.h>
+#else
 #include "alias.h"
+#endif

 /*
 * These functions are for backwards compatibility and because apps may
--- a/sys/netinet/libalias/alias_pptp.c
+++ b/sys/netinet/libalias/alias_pptp.c
@ -66,15 +66,23 @@ __FBSDID("$FreeBSD$");
 */

 /* Includes */
+#ifdef _KERNEL
+#include <sys/param.h>
+#else
 #include <sys/types.h>
+#include <stdio.h>
+#endif
+
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>

-#include <stdio.h>
-
+#ifdef _KERNEL
+#include <netinet/libalias/alias_local.h>
+#else
 #include "alias_local.h"
+#endif

 /*
 * PPTP definitions
--- a/sys/netinet/libalias/alias_proxy.c
+++ b/sys/netinet/libalias/alias_proxy.c
@ -54,14 +54,23 @@ __FBSDID("$FreeBSD$");


 /* System includes */
+#ifdef _KERNEL
+#include <sys/param.h>
+#include <sys/ctype.h>
+#include <sys/libkern.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/limits.h>
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <netdb.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
+#include <arpa/inet.h>
+#endif

 /* BSD IPV4 includes */
 #include <netinet/in_systm.h>
@ -69,12 +78,13 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip.h>
 #include <netinet/tcp.h>

-#include <arpa/inet.h>
-
+#ifdef _KERNEL
+#include <netinet/libalias/alias_local.h>
+#include <netinet/libalias/alias.h>
+#else
 #include "alias_local.h"	/* Functions used by alias*.c */
 #include "alias.h"		/* Public API functions for libalias */
-
-
+#endif

 /*
    Data structures
--- a/sys/netinet/libalias/alias_skinny.c
+++ b/sys/netinet/libalias/alias_skinny.c
@ -30,19 +30,28 @@
 * $FreeBSD$
 */

-#include <stdio.h>
-#include <string.h>
+#ifdef _KERNEL
+#include <sys/param.h>
+#else
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <arpa/inet.h>
+#endif
+
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
-#include <unistd.h>

+#ifdef _KERNEL
+#include <netinet/libalias/alias_local.h>
+#else
 #include "alias_local.h"
+#endif

 /*
 * alias_skinny.c handles the translation for the Cisco Skinny Station
--- a/sys/netinet/libalias/alias_smedia.c
+++ b/sys/netinet/libalias/alias_smedia.c
@ -98,16 +98,27 @@ __FBSDID("$FreeBSD$");
   Initial version:  May, 2000 (eds)
 */

+#ifdef _KERNEL
+#include <sys/param.h>
+#include <sys/libkern.h>
+#else
+#include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/types.h>
+#endif
+
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>

+#ifdef _KERNEL
+#include <netinet/libalias/alias_local.h>
+#include <netinet/libalias/alias.h>
+#else
 #include "alias_local.h"
+#endif

 #define RTSP_CONTROL_PORT_NUMBER_1 554
 #define RTSP_CONTROL_PORT_NUMBER_2 7070
--- a/sys/netinet/libalias/alias_util.c
+++ b/sys/netinet/libalias/alias_util.c
@ -50,15 +50,25 @@ then these routines will give a result of zero (useful for testing
 purposes);
 */

-#include <stdio.h>
+#ifdef _KERNEL
+#include <sys/param.h>
+#else
 #include <sys/types.h>
+#include <stdio.h>
+#endif
+
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>

+#ifdef _KERNEL
+#include <netinet/libalias/alias.h>
+#include <netinet/libalias/alias_local.h>
+#else
 #include "alias.h"
 #include "alias_local.h"
+#endif

 u_short
 LibAliasInternetChecksum(struct libalias *la, u_short * ptr, int nbytes)