diff options
| author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2010-04-29 11:52:42 +0000 |
|---|---|---|
| committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2010-04-29 11:52:42 +0000 |
| commit | 82cea7e6f3da448dfadd071ac81f4a0b1e41a356 (patch) | |
| tree | e6f9695e24617b291f2a8f0b1f388eda2e605549 /sys/netinet/ip_var.h | |
| parent | deb3b115e23af3fd3016c4105caf4a3f9b01c7a3 (diff) | |
| download | src-82cea7e6f3da448dfadd071ac81f4a0b1e41a356.tar.gz src-82cea7e6f3da448dfadd071ac81f4a0b1e41a356.zip | |
MFP4: @176978-176982, 176984, 176990-176994, 177441
"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
Notes
Notes:
svn path=/head/; revision=207369
Diffstat (limited to 'sys/netinet/ip_var.h')
| -rw-r--r-- | sys/netinet/ip_var.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index 389ad6ee3169..4415001fc279 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -181,9 +181,13 @@ VNET_DECLARE(int, ipforwarding); /* ip forwarding */ #ifdef IPSTEALTH VNET_DECLARE(int, ipstealth); /* stealth forwarding */ #endif -VNET_DECLARE(int, rsvp_on); +extern u_char ip_protox[]; VNET_DECLARE(struct socket *, ip_rsvpd); /* reservation protocol daemon*/ VNET_DECLARE(struct socket *, ip_mrouter); /* multicast routing daemon */ +extern int (*legal_vif_num)(int); +extern u_long (*ip_mcast_src)(int); +VNET_DECLARE(int, rsvp_on); +extern struct pr_usrreqs rip_usrreqs; #define V_ipstat VNET(ipstat) #define V_ip_id VNET(ip_id) @@ -192,14 +196,9 @@ VNET_DECLARE(struct socket *, ip_mrouter); /* multicast routing daemon */ #ifdef IPSTEALTH #define V_ipstealth VNET(ipstealth) #endif -#define V_rsvp_on VNET(rsvp_on) #define V_ip_rsvpd VNET(ip_rsvpd) #define V_ip_mrouter VNET(ip_mrouter) - -extern u_char ip_protox[]; -extern int (*legal_vif_num)(int); -extern u_long (*ip_mcast_src)(int); -extern struct pr_usrreqs rip_usrreqs; +#define V_rsvp_on VNET(rsvp_on) void inp_freemoptions(struct ip_moptions *); int inp_getmoptions(struct inpcb *, struct sockopt *); |