diff options
| author | Darren Reed <darrenr@FreeBSD.org> | 2001-07-28 11:58:26 +0000 |
|---|---|---|
| committer | Darren Reed <darrenr@FreeBSD.org> | 2001-07-28 11:58:26 +0000 |
| commit | 354699e12f3e5a60ca654b9ff3fcfc421a969bfc (patch) | |
| tree | bf3386d7fdd263e4118db801dd9684a155d8d1d1 /sys/contrib/ipfilter/netinet/ip_nat.h | |
| parent | 5e3b2d6847bea368e1c03f4de62de7edd5067f9c (diff) | |
| download | src-354699e12f3e5a60ca654b9ff3fcfc421a969bfc.tar.gz src-354699e12f3e5a60ca654b9ff3fcfc421a969bfc.zip | |
fix conflicts created by import
Notes
Notes:
svn path=/head/; revision=80482
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_nat.h')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_nat.h | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.h b/sys/contrib/ipfilter/netinet/ip_nat.h index afa7e14bd578..20f7a14dd831 100644 --- a/sys/contrib/ipfilter/netinet/ip_nat.h +++ b/sys/contrib/ipfilter/netinet/ip_nat.h @@ -1,9 +1,7 @@ /* - * Copyright (C) 1995-2000 by Darren Reed. + * Copyright (C) 1995-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. * * @(#)ip_nat.h 1.5 2/4/96 * $Id: ip_nat.h,v 2.17.2.14 2000/11/18 03:58:04 darrenr Exp $ @@ -36,10 +34,18 @@ * appropriate sizes. The figures below were used for * a setup with 1000-2000 networks to NAT. */ -#define NAT_SIZE 127 -#define RDR_SIZE 127 -#define HOSTMAP_SIZE 127 -#define NAT_TABLE_SZ 127 +#ifndef NAT_SIZE +# define NAT_SIZE 127 +#endif +#ifndef RDR_SIZE +# define RDR_SIZE 127 +#endif +#ifndef HOSTMAP_SIZE +# define HOSTMAP_SIZE 127 +#endif +#ifndef NAT_TABLE_SZ +# define NAT_TABLE_SZ 127 +#endif #ifdef LARGE_NAT #undef NAT_SIZE #undef RDR_SIZE @@ -202,11 +208,13 @@ typedef struct natstat { u_long ns_memfail; u_long ns_badnat; nat_t **ns_table[2]; + hostmap_t **ns_maptable; ipnat_t *ns_list; void *ns_apslist; u_int ns_nattab_sz; u_int ns_rultab_sz; u_int ns_rdrtab_sz; + u_int ns_hostmap_sz; nat_t *ns_instances; u_int ns_wilds; } natstat_t; @@ -221,7 +229,7 @@ typedef struct natstat { #define IPN_AUTOPORTMAP 0x010 #define IPN_IPRANGE 0x020 #define IPN_USERFLAGS (IPN_TCPUDP|IPN_AUTOPORTMAP|IPN_IPRANGE|IPN_SPLIT|\ - IPN_ROUNDR|IPN_FILTER|IPN_NOTSRC|IPN_NOTDST) + IPN_ROUNDR|IPN_FILTER|IPN_NOTSRC|IPN_NOTDST|IPN_FRAG) #define IPN_FILTER 0x040 #define IPN_SPLIT 0x080 #define IPN_ROUNDR 0x100 @@ -302,8 +310,8 @@ extern int ip_natout __P((ip_t *, fr_info_t *)); extern int ip_natin __P((ip_t *, fr_info_t *)); extern void ip_natunload __P((void)), ip_natexpire __P((void)); extern void nat_log __P((struct nat *, u_int)); -extern void fix_incksum __P((u_short *, u_32_t)); -extern void fix_outcksum __P((u_short *, u_32_t)); +extern void fix_incksum __P((fr_info_t *, u_short *, u_32_t)); +extern void fix_outcksum __P((fr_info_t *, u_short *, u_32_t)); extern void fix_datacksum __P((u_short *, u_32_t)); #endif /* __IP_NAT_H__ */ |