diff options
author | bz <bz@FreeBSD.org> | 2008-12-11 16:26:38 +0000 |
---|---|---|
committer | bz <bz@FreeBSD.org> | 2008-12-11 16:26:38 +0000 |
commit | 83a32f8750135cc82be5727b54cb42797923009b (patch) | |
tree | 969ea1192ccca86b51199d256a5beea929f92162 /sys/netinet6 | |
parent | 83955c51afc9c7fd1b9b5164cbbbf65f1706262b (diff) | |
download | FreeBSD-src-83a32f8750135cc82be5727b54cb42797923009b.zip FreeBSD-src-83a32f8750135cc82be5727b54cb42797923009b.tar.gz |
Put a global variables, which were virtualized but formerly
missed under VIMAGE_GLOBAL.
Start putting the extern declarations of the virtualized globals
under VIMAGE_GLOBAL as the globals themsevles are already.
This will help by the time when we are going to remove the globals
entirely.
While there garbage collect a few dead externs from ip6_var.h.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/netinet6')
-rw-r--r-- | sys/netinet6/in6_proto.c | 2 | ||||
-rw-r--r-- | sys/netinet6/in6_var.h | 2 | ||||
-rw-r--r-- | sys/netinet6/ip6_var.h | 13 | ||||
-rw-r--r-- | sys/netinet6/nd6.h | 6 | ||||
-rw-r--r-- | sys/netinet6/tcp6_var.h | 2 | ||||
-rw-r--r-- | sys/netinet6/vinet6.h | 2 |
6 files changed, 15 insertions, 12 deletions
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 380ee55..7090243 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -390,9 +390,7 @@ int ip6_keepfaith; time_t ip6_log_time; int ip6stealth; int nd6_onlink_ns_rfc4861; -#endif -#ifdef VIMAGE_GLOBALS /* icmp6 */ /* * BSDI4 defines these variables in in_proto.c... diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index c5642e2..e906d7c 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -470,9 +470,11 @@ struct in6_rrenumreq { #endif #ifdef _KERNEL +#ifdef VIMAGE_GLOBALS extern struct in6_ifaddr *in6_ifaddr; extern struct icmp6stat icmp6stat; +#endif /* VIMAGE_GLOBALS */ #define in6_ifstat_inc(ifp, tag) \ do { \ if (ifp) \ diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index 8f0c2c5..e384da1 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -279,6 +279,7 @@ struct ip6aux { #define IP6_HDR_ALIGNED_P(ip) ((((intptr_t) (ip)) & 3) == 0) #endif +#ifdef VIMAGE_GLOBALS extern struct ip6stat ip6stat; /* statistics */ extern int ip6_defhlim; /* default hop limit */ extern int ip6_defmcasthlim; /* default multicast hop limit */ @@ -290,8 +291,10 @@ extern int ip6_rr_prune; /* router renumbering prefix * walk list every 5 sec. */ extern int ip6_mcast_pmtu; /* enable pMTU discovery for multicast? */ extern int ip6_v6only; +#endif /* VIMAGE_GLOBALS */ extern struct socket *ip6_mrouter; /* multicast routing daemon */ +#ifdef VIMAGE_GLOBALS extern int ip6_sendredirects; /* send IP redirects when forwarding? */ extern int ip6_maxfragpackets; /* Maximum packets in reassembly queue */ extern int ip6_maxfrags; /* Maximum fragments in reassembly queue */ @@ -304,17 +307,13 @@ extern time_t ip6_log_time; extern int ip6_hdrnestlimit; /* upper limit of # of extension headers */ extern int ip6_dad_count; /* DupAddrDetectionTransmits */ -extern int ip6_auto_flowlabel; -extern int ip6_auto_linklocal; - -extern int ip6_anonportmin; /* minimum ephemeral port */ -extern int ip6_anonportmax; /* maximum ephemeral port */ -extern int ip6_lowportmin; /* minimum reserved port */ -extern int ip6_lowportmax; /* maximum reserved port */ +extern int ip6_auto_flowlabel; +extern int ip6_auto_linklocal; extern int ip6_use_tempaddr; /* whether to use temporary addresses. */ extern int ip6_prefer_tempaddr; /* whether to prefer temporary addresses in the source address selection */ +#endif /* VIMAGE_GLOBALS */ extern int ip6_use_defzone; /* whether to use the default scope zone when unspecified */ diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index 4b4d6ec..4d3c06b 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -328,6 +328,7 @@ struct nd_pfxrouter { LIST_HEAD(nd_prhead, nd_prefix); /* nd6.c */ +#ifdef VIMAGE_GLOBALS extern int nd6_prune; extern int nd6_delay; extern int nd6_umaxtries; @@ -341,8 +342,6 @@ extern struct nd_prhead nd_prefix; extern int nd6_debug; extern int nd6_onlink_ns_rfc4861; -#define nd6log(x) do { if (V_nd6_debug) log x; } while (/*CONSTCOND*/ 0) - extern struct callout nd6_timer_ch; /* nd6_rtr.c */ @@ -351,6 +350,9 @@ extern int ip6_desync_factor; /* seconds */ extern u_int32_t ip6_temp_preferred_lifetime; /* seconds */ extern u_int32_t ip6_temp_valid_lifetime; /* seconds */ extern int ip6_temp_regen_advance; /* seconds */ +#endif /* VIMAGE_GLOBALS */ + +#define nd6log(x) do { if (V_nd6_debug) log x; } while (/*CONSTCOND*/ 0) union nd_opts { struct nd_opt_hdr *nd_opt_array[8]; /* max = target address list */ diff --git a/sys/netinet6/tcp6_var.h b/sys/netinet6/tcp6_var.h index f3611c2..18a48a3 100644 --- a/sys/netinet6/tcp6_var.h +++ b/sys/netinet6/tcp6_var.h @@ -67,7 +67,9 @@ SYSCTL_DECL(_net_inet6_tcp6); #endif +#ifdef VIMAGE_GLOBALS extern int tcp_v6mssdflt; /* XXX */ +#endif struct ip6_hdr; void tcp6_ctlinput __P((int, struct sockaddr *, void *)); diff --git a/sys/netinet6/vinet6.h b/sys/netinet6/vinet6.h index d509977..d6c3f33 100644 --- a/sys/netinet6/vinet6.h +++ b/sys/netinet6/vinet6.h @@ -77,6 +77,7 @@ struct vnet_inet6 { int _nd6_inuse; int _nd6_allocated; + int _nd6_onlink_ns_rfc4861; struct llinfo_nd6 _llinfo_nd6; struct nd_drhead _nd_defrouter; struct nd_prhead _nd_prefix; @@ -109,7 +110,6 @@ struct vnet_inet6 { int _ip6_keepfaith; int _ip6stealth; time_t _ip6_log_time; - int _nd6_onlink_ns_rfc4861; int _pmtu_expire; int _pmtu_probe; |