82cea7e6f3
"Whitspace" churn after the VIMAGE/VNET whirls. Remove the need for some "init" functions within the network stack, like pim6_init(), icmp_init() or significantly shorten others like ip6_init() and nd6_init(), using static initialization again where possible and formerly missed. Move (most) variables back to the place they used to be before the container structs and VIMAGE_GLOABLS (before r185088) and try to reduce the diff to stable/7 and earlier as good as possible, to help out-of-tree consumers to update from 6.x or 7.x to 8 or 9. This also removes some header file pollution for putatively static global variables. Revert VIMAGE specific changes in ipfilter::ip_auth.c, that are no longer needed. Reviewed by: jhb Discussed with: rwatson Sponsored by: The FreeBSD Foundation Sponsored by: CK Software GmbH MFC after: 6 days
69 lines
2.4 KiB
C
69 lines
2.4 KiB
C
/* $FreeBSD$ */
|
|
/* $OpenBSD: ip_ipip.h,v 1.5 2002/06/09 16:26:10 itojun Exp $ */
|
|
/*-
|
|
* The authors of this code are John Ioannidis (ji@tla.org),
|
|
* Angelos D. Keromytis (kermit@csd.uch.gr) and
|
|
* Niels Provos (provos@physnet.uni-hamburg.de).
|
|
*
|
|
* The original version of this code was written by John Ioannidis
|
|
* for BSD/OS in Athens, Greece, in November 1995.
|
|
*
|
|
* Ported to OpenBSD and NetBSD, with additional transforms, in December 1996,
|
|
* by Angelos D. Keromytis.
|
|
*
|
|
* Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis
|
|
* and Niels Provos.
|
|
*
|
|
* Additional features in 1999 by Angelos D. Keromytis.
|
|
*
|
|
* Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis,
|
|
* Angelos D. Keromytis and Niels Provos.
|
|
* Copyright (c) 2001, Angelos D. Keromytis.
|
|
*
|
|
* Permission to use, copy, and modify this software with or without fee
|
|
* is hereby granted, provided that this entire notice is included in
|
|
* all copies of any software which is or includes a copy or
|
|
* modification of this software.
|
|
* You may use this code under the GNU public license if you so wish. Please
|
|
* contribute changes back to the authors under this freer than GPL license
|
|
* so that we may further the use of strong encryption without limitations to
|
|
* all.
|
|
*
|
|
* THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
|
|
* IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
|
|
* REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
|
|
* MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
|
|
* PURPOSE.
|
|
*/
|
|
|
|
#ifndef _NETINET_IPIP_H_
|
|
#define _NETINET_IPIP_H_
|
|
|
|
/*
|
|
* IP-inside-IP processing.
|
|
* Not quite all the functionality of RFC-1853, but the main idea is there.
|
|
*/
|
|
|
|
struct ipipstat
|
|
{
|
|
u_int32_t ipips_ipackets; /* total input packets */
|
|
u_int32_t ipips_opackets; /* total output packets */
|
|
u_int32_t ipips_hdrops; /* packet shorter than header shows */
|
|
u_int32_t ipips_qfull;
|
|
u_int64_t ipips_ibytes;
|
|
u_int64_t ipips_obytes;
|
|
u_int32_t ipips_pdrops; /* packet dropped due to policy */
|
|
u_int32_t ipips_spoof; /* IP spoofing attempts */
|
|
u_int32_t ipips_family; /* Protocol family mismatch */
|
|
u_int32_t ipips_unspec; /* Missing tunnel endpoint address */
|
|
};
|
|
|
|
#ifdef _KERNEL
|
|
VNET_DECLARE(int, ipip_allow);
|
|
VNET_DECLARE(struct ipipstat, ipipstat);
|
|
|
|
#define V_ipip_allow VNET(ipip_allow)
|
|
#define V_ipipstat VNET(ipipstat)
|
|
#endif /* _KERNEL */
|
|
#endif /* _NETINET_IPIP_H_ */
|