diff options
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_auth.c')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_auth.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_auth.c b/sys/contrib/ipfilter/netinet/ip_auth.c index a3182e2..ee3a7d7 100644 --- a/sys/contrib/ipfilter/netinet/ip_auth.c +++ b/sys/contrib/ipfilter/netinet/ip_auth.c @@ -3,6 +3,9 @@ * * See the IPFILTER.LICENCE file for details on licencing. */ +#ifdef __sgi +# include <sys/ptimers.h> +#endif #include <sys/errno.h> #include <sys/types.h> #include <sys/param.h> @@ -19,7 +22,6 @@ #else # include <sys/ioctl.h> #endif -#include <sys/uio.h> #ifndef linux # include <sys/protosw.h> #endif @@ -311,7 +313,7 @@ ip_t *ip; int fr_auth_ioctl(data, mode, cmd, fr, frptr) caddr_t data; int mode; -#if defined(__NetBSD__) || defined(__OpenBSD__) || (FreeBSD_version >= 300003) +#if defined(__NetBSD__) || defined(__OpenBSD__) || (__FreeBSD_version >= 300003) u_long cmd; #else int cmd; @@ -382,9 +384,7 @@ frentry_t *fr, **frptr; error = EINVAL; break; case SIOCATHST: - READ_ENTER(&ipf_auth); fr_authstats.fas_faelist = fae_list; - RWLOCK_EXIT(&ipf_auth); error = IWCOPYPTR((char *)&fr_authstats, data, sizeof(fr_authstats)); break; @@ -458,7 +458,7 @@ fr_authioctlloop: bzero((char *)&ro, sizeof(ro)); # if ((_BSDI_VERSION >= 199802) && (_BSDI_VERSION < 200005)) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || (defined(IRIX) && (IRIX >= 605)) error = ip_output(m, NULL, &ro, IP_FORWARDING, NULL, NULL); # else @@ -526,7 +526,6 @@ fr_authioctlloop: } -#ifdef _KERNEL /* * Free all network buffer memory used to keep saved packets. */ @@ -587,7 +586,7 @@ void fr_authexpire() register frauthent_t *fae, **faep; register frentry_t *fr, **frp; mb_t *m; -#if !SOLARIS +#if !SOLARIS && defined(_KERNEL) int s; #endif @@ -626,4 +625,3 @@ void fr_authexpire() RWLOCK_EXIT(&ipf_auth); SPL_X(s); } -#endif |
