Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dist/ipf/netinet Import IPFilter 4.1.3
details: https://anonhg.NetBSD.org/src/rev/4121e5cd149a
branches: trunk
changeset: 572363:4121e5cd149a
user: martti <martti%NetBSD.org@localhost>
date: Fri Dec 31 11:30:42 2004 +0000
description:
Import IPFilter 4.1.3
diffstat:
sys/dist/ipf/netinet/ip_auth.h | 6 +++---
sys/dist/ipf/netinet/ip_fil.h | 8 ++++----
sys/dist/ipf/netinet/ip_frag.c | 11 +++--------
sys/dist/ipf/netinet/ip_frag.h | 8 ++++----
sys/dist/ipf/netinet/ip_h323_pxy.c | 8 +-------
sys/dist/ipf/netinet/ip_htable.c | 2 +-
sys/dist/ipf/netinet/ip_htable.h | 2 +-
sys/dist/ipf/netinet/ip_ipsec_pxy.c | 5 +----
sys/dist/ipf/netinet/ip_log.c | 6 +-----
sys/dist/ipf/netinet/ip_lookup.c | 2 +-
sys/dist/ipf/netinet/ip_lookup.h | 2 +-
sys/dist/ipf/netinet/ip_netbios_pxy.c | 4 +---
sys/dist/ipf/netinet/ip_pool.c | 4 ++--
sys/dist/ipf/netinet/ip_pool.h | 2 +-
sys/dist/ipf/netinet/ip_pptp_pxy.c | 2 +-
sys/dist/ipf/netinet/ip_proxy.c | 2 +-
sys/dist/ipf/netinet/ip_proxy.h | 8 ++++----
sys/dist/ipf/netinet/ip_raudio_pxy.c | 5 +----
sys/dist/ipf/netinet/ip_scan.h | 2 +-
sys/dist/ipf/netinet/ip_state.h | 8 ++++----
sys/dist/ipf/netinet/ip_sync.c | 2 +-
sys/dist/ipf/netinet/ip_sync.h | 2 +-
sys/dist/ipf/netinet/ipl.h | 2 +-
23 files changed, 40 insertions(+), 63 deletions(-)
diffs (truncated from 374 to 300 lines):
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_auth.h
--- a/sys/dist/ipf/netinet/ip_auth.h Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_auth.h Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_auth.h,v 1.1 2004/10/01 15:25:59 christos Exp $ */
+/* $NetBSD: ip_auth.h,v 1.1.1.1 2004/12/31 11:30:42 martti Exp $ */
/*
* Copyright (C) 1997-2001 by Darren Reed & Guido Van Rooij.
@@ -8,8 +8,8 @@
* Id: ip_auth.h,v 2.16 2003/07/25 12:29:56 darrenr Exp
*
*/
-#ifndef _NETINET_IP_AUTH_H_
-#define _NETINET_IP_AUTH_H_
+#ifndef __IP_AUTH_H__
+#define __IP_AUTH_H__
#define FR_NUMAUTH 32
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_fil.h
--- a/sys/dist/ipf/netinet/ip_fil.h Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_fil.h Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil.h,v 1.1 2004/10/01 15:26:00 christos Exp $ */
+/* $NetBSD: ip_fil.h,v 1.1.1.1 2004/12/31 11:30:43 martti Exp $ */
/*
* Copyright (C) 1993-2001, 2003 by Darren Reed.
@@ -9,8 +9,8 @@
* Id: ip_fil.h,v 2.170.2.5 2004/06/08 13:14:17 darrenr Exp
*/
-#ifndef _NETINET_IP_FIL_H_
-#define _NETINET_IP_FIL_H_
+#ifndef __IP_FIL_H__
+#define __IP_FIL_H__
#ifndef SOLARIS
# define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
@@ -1327,4 +1327,4 @@
extern u_char ipf_iss_secret[32];
extern ipftuneable_t ipf_tuneables[];
-#endif /* _NETINET_IP_FIL_H_ */
+#endif /* __IP_FIL_H__ */
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_frag.c
--- a/sys/dist/ipf/netinet/ip_frag.c Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_frag.c Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_frag.c,v 1.1 2004/10/01 15:26:00 christos Exp $ */
+/* $NetBSD: ip_frag.c,v 1.1.1.1 2004/12/31 11:30:43 martti Exp $ */
/*
* Copyright (C) 1993-2003 by Darren Reed.
@@ -101,14 +101,9 @@
/* END OF INCLUDES */
#if !defined(lint)
-#if defined(__NetBSD__)
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_frag.c,v 1.1 2004/10/01 15:26:00 christos Exp $");
-#else
static const char sccsid[] = "@(#)ip_frag.c 1.11 3/24/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_frag.c,v 2.77 2004/01/27 00:24:54 darrenr Exp";
#endif
-#endif
static ipfr_t *ipfr_list = NULL;
@@ -398,7 +393,7 @@
WRITE_ENTER(&ipf_ipidfrag);
fra = ipfr_newfrag(fin, 0, ipfr_ipidtab);
if (fra != NULL) {
- fra->ipfr_data = (void *)(intptr_t)ipid;
+ fra->ipfr_data = (void *)ipid;
*ipfr_ipidtail = fra;
fra->ipfr_prev = ipfr_ipidtail;
ipfr_ipidtail = &fra->ipfr_next;
@@ -583,7 +578,7 @@
READ_ENTER(&ipf_ipidfrag);
ipf = fr_fraglookup(fin, ipfr_ipidtab);
if (ipf != NULL)
- id = (u_32_t)(intptr_t)ipf->ipfr_data;
+ id = (u_32_t)ipf->ipfr_data;
else
id = 0xffffffff;
RWLOCK_EXIT(&ipf_ipidfrag);
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_frag.h
--- a/sys/dist/ipf/netinet/ip_frag.h Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_frag.h Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_frag.h,v 1.1 2004/10/01 15:26:00 christos Exp $ */
+/* $NetBSD: ip_frag.h,v 1.1.1.1 2004/12/31 11:30:43 martti Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
@@ -9,8 +9,8 @@
* Id: ip_frag.h,v 2.23.2.1 2004/03/29 16:21:56 darrenr Exp
*/
-#ifndef _NETINET_IP_FRAG_H_
-#define _NETINET_IP_FRAG_H_
+#ifndef __IP_FRAG_H__
+#define __IP_FRAG_H__
#define IPFT_SIZE 257
@@ -83,4 +83,4 @@
extern int fr_slowtimer __P((void));
#endif
-#endif /* _NETINET_IP_FRAG_H_ */
+#endif /* __IP_FRAG_H__ */
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_h323_pxy.c
--- a/sys/dist/ipf/netinet/ip_h323_pxy.c Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_h323_pxy.c Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_h323_pxy.c,v 1.1 2004/10/02 07:51:53 christos Exp $ */
+/* $NetBSD: ip_h323_pxy.c,v 1.1.1.1 2004/12/31 11:30:43 martti Exp $ */
/*
* Copyright 2001, QNX Software Systems Ltd. All Rights Reserved
@@ -30,12 +30,6 @@
# endif
#endif
-#ifdef _KERNEL_OPT
-#include "opt_ipfilter_log.h"
-#endif
-
-__KERNEL_RCSID(1, "$NetBSD: ip_h323_pxy.c,v 1.1 2004/10/02 07:51:53 christos Exp $");
-
#define IPF_H323_PROXY
int ippr_h323_init __P((void));
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_htable.c
--- a/sys/dist/ipf/netinet/ip_htable.c Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_htable.c Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_htable.c,v 1.1 2004/10/01 15:26:00 christos Exp $ */
+/* $NetBSD: ip_htable.c,v 1.1.1.1 2004/12/31 11:30:44 martti Exp $ */
/*
* Copyright (C) 1993-2001, 2003 by Darren Reed.
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_htable.h
--- a/sys/dist/ipf/netinet/ip_htable.h Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_htable.h Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_htable.h,v 1.1 2004/10/02 07:59:14 jdolecek Exp $ */
+/* $NetBSD: ip_htable.h,v 1.1.1.1 2004/12/31 11:30:44 martti Exp $ */
#ifndef __IP_HTABLE_H__
#define __IP_HTABLE_H__
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_ipsec_pxy.c
--- a/sys/dist/ipf/netinet/ip_ipsec_pxy.c Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_ipsec_pxy.c Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_ipsec_pxy.c,v 1.1 2004/10/01 15:26:00 christos Exp $ */
+/* $NetBSD: ip_ipsec_pxy.c,v 1.1.1.1 2004/12/31 11:30:43 martti Exp $ */
/*
* Copyright (C) 2001-2003 by Darren Reed
@@ -11,9 +11,6 @@
* Id: ip_ipsec_pxy.c,v 2.20.2.3 2004/06/07 14:20:05 darrenr Exp
*
*/
-
-__KERNEL_RCSID(1, "$NetBSD: ip_ipsec_pxy.c,v 1.1 2004/10/01 15:26:00 christos Exp $");
-
#define IPF_IPSEC_PROXY
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_log.c
--- a/sys/dist/ipf/netinet/ip_log.c Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_log.c Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_log.c,v 1.1 2004/10/01 15:26:00 christos Exp $ */
+/* $NetBSD: ip_log.c,v 1.1.1.1 2004/12/31 11:30:44 martti Exp $ */
/*
* Copyright (C) 1997-2003 by Darren Reed.
@@ -7,10 +7,6 @@
*
* Id: ip_log.c,v 2.75.2.5 2004/07/13 14:25:36 darrenr Exp
*/
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_log.c,v 1.1 2004/10/01 15:26:00 christos Exp $");
-
#include <sys/param.h>
#if defined(KERNEL) || defined(_KERNEL)
# undef KERNEL
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_lookup.c
--- a/sys/dist/ipf/netinet/ip_lookup.c Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_lookup.c Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_lookup.c,v 1.1 2004/10/01 15:26:00 christos Exp $ */
+/* $NetBSD: ip_lookup.c,v 1.1.1.1 2004/12/31 11:30:44 martti Exp $ */
/*
* Copyright (C) 2002-2003 by Darren Reed.
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_lookup.h
--- a/sys/dist/ipf/netinet/ip_lookup.h Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_lookup.h Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_lookup.h,v 1.1 2004/10/05 04:56:41 yamt Exp $ */
+/* $NetBSD: ip_lookup.h,v 1.1.1.1 2004/12/31 11:30:44 martti Exp $ */
#ifndef __IP_LOOKUP_H__
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_netbios_pxy.c
--- a/sys/dist/ipf/netinet/ip_netbios_pxy.c Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_netbios_pxy.c Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_netbios_pxy.c,v 1.1 2004/10/02 07:51:53 christos Exp $ */
+/* $NetBSD: ip_netbios_pxy.c,v 1.1.1.1 2004/12/31 11:30:44 martti Exp $ */
/*
* Simple netbios-dgm transparent proxy for in-kernel use.
@@ -34,8 +34,6 @@
* Id: ip_netbios_pxy.c,v 2.8 2003/12/01 02:52:16 darrenr Exp
*/
-__KERNEL_RCSID(1, "$NetBSD: ip_netbios_pxy.c,v 1.1 2004/10/02 07:51:53 christos Exp $");
-
#define IPF_NETBIOS_PROXY
int ippr_netbios_init __P((void));
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_pool.c
--- a/sys/dist/ipf/netinet/ip_pool.c Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_pool.c Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_pool.c,v 1.1 2004/10/01 15:26:00 christos Exp $ */
+/* $NetBSD: ip_pool.c,v 1.1.1.1 2004/12/31 11:30:43 martti Exp $ */
/*
* Copyright (C) 1993-2001, 2003 by Darren Reed.
@@ -135,7 +135,7 @@
bzero((char *)&b, sizeof(b));
bzero((char *)&ip, sizeof(ip));
bzero((char *)&op, sizeof(op));
- strlcpy(op.iplo_name, "0", sizeof(op.iplo_name));
+ strcpy(op.iplo_name, "0");
if (ip_pool_create(&op) == 0)
ipo = ip_pool_find(0, "0");
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_pool.h
--- a/sys/dist/ipf/netinet/ip_pool.h Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_pool.h Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_pool.h,v 1.1 2004/10/01 15:26:00 christos Exp $ */
+/* $NetBSD: ip_pool.h,v 1.1.1.1 2004/12/31 11:30:45 martti Exp $ */
/*
* Copyright (C) 1993-2001, 2003 by Darren Reed.
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_pptp_pxy.c
--- a/sys/dist/ipf/netinet/ip_pptp_pxy.c Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_pptp_pxy.c Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_pptp_pxy.c,v 1.1 2004/10/02 07:51:53 christos Exp $ */
+/* $NetBSD: ip_pptp_pxy.c,v 1.1.1.1 2004/12/31 11:30:45 martti Exp $ */
/*
* Copyright (C) 2002-2003 by Darren Reed
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_proxy.c
--- a/sys/dist/ipf/netinet/ip_proxy.c Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_proxy.c Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_proxy.c,v 1.1 2004/10/01 15:26:00 christos Exp $ */
+/* $NetBSD: ip_proxy.c,v 1.1.1.1 2004/12/31 11:30:45 martti Exp $ */
/*
* Copyright (C) 1997-2003 by Darren Reed.
diff -r cab27d300dcf -r 4121e5cd149a sys/dist/ipf/netinet/ip_proxy.h
--- a/sys/dist/ipf/netinet/ip_proxy.h Fri Dec 31 11:06:53 2004 +0000
+++ b/sys/dist/ipf/netinet/ip_proxy.h Fri Dec 31 11:30:42 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_proxy.h,v 1.1 2004/10/01 15:26:00 christos Exp $ */
+/* $NetBSD: ip_proxy.h,v 1.1.1.1 2004/12/31 11:30:45 martti Exp $ */
/*
* Copyright (C) 1997-2001 by Darren Reed.
@@ -8,8 +8,8 @@
* Id: ip_proxy.h,v 2.31 2003/07/25 12:29:59 darrenr Exp
*/
-#ifndef _NETINET_IP_PROXY_H_
-#define _NETINET_IP_PROXY_H_
+#ifndef __IP_PROXY_H__
+#define __IP_PROXY_H__
#ifndef SOLARIS
#define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
@@ -415,4 +415,4 @@
extern int appr_new __P((fr_info_t *, struct nat *));
extern int appr_ioctl __P((caddr_t, ioctlcmd_t, int));
-#endif /* _NETINET_IP_PROXY_H_ */
+#endif /* __IP_PROXY_H__ */
Home |
Main Index |
Thread Index |
Old Index