[src/netbsd-1-5]: src/sys/netinet Pull up revisions 1.8-1.10 (requested by ma...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f5e28471934a
branches:  netbsd-1-5
changeset: 492696:f5e28471934a
user:      he <he%NetBSD.org@localhost>
date:      Sat Feb 09 16:56:19 2002 +0000

description:
Pull up revisions 1.8-1.10 (requested by martti):
  Updated IPFilter to 3.4.23

diffstat:

 sys/netinet/ip_auth.h |  21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diffs (48 lines):

diff -r 65e5213f8716 -r f5e28471934a sys/netinet/ip_auth.h
--- a/sys/netinet/ip_auth.h     Sat Feb 09 16:56:17 2002 +0000
+++ b/sys/netinet/ip_auth.h     Sat Feb 09 16:56:19 2002 +0000
@@ -1,16 +1,13 @@
-/*     $NetBSD: ip_auth.h,v 1.7 2000/05/23 06:07:43 veego Exp $        */
+/*     $NetBSD: ip_auth.h,v 1.7.4.1 2002/02/09 16:56:19 he Exp $       */
 
 /*
- * Copyright (C) 1997-2000 by Darren Reed & Guido Van Rooij.
+ * Copyright (C) 1997-2001 by Darren Reed & Guido Van Rooij.
  *
- * 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.
  *
- * Id: ip_auth.h,v 2.3.2.1 2000/05/22 10:26:11 darrenr Exp
+ * Id: ip_auth.h,v 2.3.2.5 2001/11/04 13:15:51 darrenr Exp
  *
  */
-
 #ifndef _NETINET_IP_AUTH_H_
 #define _NETINET_IP_AUTH_H_
 
@@ -49,8 +46,6 @@
 extern frentry_t       *ipauth;
 extern struct fr_authstat      fr_authstats;
 extern int     fr_defaultauthage;
-extern int     fr_authstart;
-extern int     fr_authend;
 extern int     fr_authsize;
 extern int     fr_authused;
 extern int     fr_auth_lock;
@@ -59,10 +54,10 @@
 extern void    fr_authunload __P((void));
 extern mb_t    *fr_authpkts[];
 extern int     fr_newauth __P((mb_t *, fr_info_t *, ip_t *));
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-extern int     fr_auth_ioctl __P((caddr_t, u_long, frentry_t *, frentry_t **));
+#if defined(__NetBSD__) || defined(__OpenBSD__) || \
+    (__FreeBSD_version >= 300003)
+extern int     fr_auth_ioctl __P((caddr_t, int, u_long, frentry_t *, frentry_t **));
 #else
-extern int     fr_auth_ioctl __P((caddr_t, int, frentry_t *, frentry_t **));
+extern int     fr_auth_ioctl __P((caddr_t, int, int, frentry_t *, frentry_t **));
 #endif
-
 #endif /* _NETINET_IP_AUTH_H_ */