diff options
| author | darrenr <darrenr@FreeBSD.org> | 2001-07-28 11:59:33 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2001-07-28 11:59:33 +0000 |
| commit | c51cd1facc817411a340278e6e0b901d53f11cc5 (patch) | |
| tree | 503d2119100a8bd3735c0bda1607f3a64ed1ad33 /contrib/ipfilter/mlf_ipl.c | |
| parent | c32397cc6efcbaabe335e3ec33e4a4dd78df29c7 (diff) | |
| download | FreeBSD-src-c51cd1facc817411a340278e6e0b901d53f11cc5.zip FreeBSD-src-c51cd1facc817411a340278e6e0b901d53f11cc5.tar.gz | |
Import IPFilter version 3.4.20
Diffstat (limited to 'contrib/ipfilter/mlf_ipl.c')
| -rw-r--r-- | contrib/ipfilter/mlf_ipl.c | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/contrib/ipfilter/mlf_ipl.c b/contrib/ipfilter/mlf_ipl.c index 3ca7df3..50c2d94 100644 --- a/contrib/ipfilter/mlf_ipl.c +++ b/contrib/ipfilter/mlf_ipl.c @@ -1,9 +1,7 @@ /* - * Copyright (C) 1993-2000 by Darren Reed. + * Copyright (C) 1993-2001 by Darren Reed. * - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and due credit is given - * to the original author and the contributors. + * See the IPFILTER.LICENCE file for details on licencing. */ /* * 29/12/94 Added code from Marc Huber <huber@fzi.de> to allow it to allocate @@ -13,12 +11,24 @@ #include <sys/param.h> -#if defined(__FreeBSD__) && (__FreeBSD__ > 1) +#if defined(__FreeBSD__) # ifdef IPFILTER_LKM -# include <osreldate.h> +# ifndef __FreeBSD_cc_version +# include <osreldate.h> +# else +# if __FreeBSD_cc_version < 430000 +# include <osreldate.h> +# endif +# endif # define ACTUALLY_LKM_NOT_KERNEL # else -# include <sys/osreldate.h> +# ifndef __FreeBSD_cc_version +# include <sys/osreldate.h> +# else +# if __FreeBSD_cc_version < 430000 +# include <sys/osreldate.h> +# endif +# endif # endif #endif #include <sys/systm.h> @@ -53,19 +63,16 @@ #if (__FreeBSD_version >= 300000) # include <sys/socket.h> #endif -#if (__FreeBSD_version >= 199511) #include <net/if.h> #include <netinet/in_systm.h> #include <netinet/in.h> #include <netinet/ip.h> #include <net/route.h> +#include <net/if.h> #include <netinet/ip_var.h> #include <netinet/tcp.h> #include <netinet/tcpip.h> -#endif -#if (__FreeBSD__ > 1) -# include <sys/sysent.h> -#endif +#include <sys/sysent.h> #include <sys/lkm.h> #include "netinet/ipl.h" #include "netinet/ip_compat.h" @@ -392,7 +399,7 @@ int cmd, ver; # endif } # endif /* IPFILTER_LKM */ -static ipl_devsw_installed = 0; +static int ipl_devsw_installed = 0; static void ipl_drvinit __P((void *unused)) { |
