diff options
Diffstat (limited to 'sys/netinet/ipfw')
| -rw-r--r-- | sys/netinet/ipfw/ip_fw2.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ipfw/ip_fw_dynamic.c | 30 | ||||
| -rw-r--r-- | sys/netinet/ipfw/ip_fw_nat.c | 2 | ||||
| -rw-r--r-- | sys/netinet/ipfw/ip_fw_pfil.c | 4 |
4 files changed, 20 insertions, 20 deletions
diff --git a/sys/netinet/ipfw/ip_fw2.c b/sys/netinet/ipfw/ip_fw2.c index 53aa5d0..43b2d11 100644 --- a/sys/netinet/ipfw/ip_fw2.c +++ b/sys/netinet/ipfw/ip_fw2.c @@ -100,10 +100,10 @@ __FBSDID("$FreeBSD$"); */ /* ipfw_vnet_ready controls when we are open for business */ -STATIC_VNET_DEFINE(int, ipfw_vnet_ready) = 0; +static VNET_DEFINE(int, ipfw_vnet_ready) = 0; #define V_ipfw_vnet_ready VNET(ipfw_vnet_ready) -STATIC_VNET_DEFINE(int, fw_deny_unknown_exthdrs); +static VNET_DEFINE(int, fw_deny_unknown_exthdrs); #define V_fw_deny_unknown_exthdrs VNET(fw_deny_unknown_exthdrs) #ifdef IPFIREWALL_DEFAULT_TO_ACCEPT diff --git a/sys/netinet/ipfw/ip_fw_dynamic.c b/sys/netinet/ipfw/ip_fw_dynamic.c index 33ff5b2..c8ea4b7 100644 --- a/sys/netinet/ipfw/ip_fw_dynamic.c +++ b/sys/netinet/ipfw/ip_fw_dynamic.c @@ -118,10 +118,10 @@ __FBSDID("$FreeBSD$"); /* * Static variables followed by global ones */ -STATIC_VNET_DEFINE(ipfw_dyn_rule **, ipfw_dyn_v); -STATIC_VNET_DEFINE(u_int32_t, dyn_buckets); -STATIC_VNET_DEFINE(u_int32_t, curr_dyn_buckets); -STATIC_VNET_DEFINE(struct callout, ipfw_timeout); +static VNET_DEFINE(ipfw_dyn_rule **, ipfw_dyn_v); +static VNET_DEFINE(u_int32_t, dyn_buckets); +static VNET_DEFINE(u_int32_t, curr_dyn_buckets); +static VNET_DEFINE(struct callout, ipfw_timeout); #define V_ipfw_dyn_v VNET(ipfw_dyn_v) #define V_dyn_buckets VNET(dyn_buckets) #define V_curr_dyn_buckets VNET(curr_dyn_buckets) @@ -150,12 +150,12 @@ ipfw_dyn_unlock(void) /* * Timeouts for various events in handing dynamic rules. */ -STATIC_VNET_DEFINE(u_int32_t, dyn_ack_lifetime); -STATIC_VNET_DEFINE(u_int32_t, dyn_syn_lifetime); -STATIC_VNET_DEFINE(u_int32_t, dyn_fin_lifetime); -STATIC_VNET_DEFINE(u_int32_t, dyn_rst_lifetime); -STATIC_VNET_DEFINE(u_int32_t, dyn_udp_lifetime); -STATIC_VNET_DEFINE(u_int32_t, dyn_short_lifetime); +static VNET_DEFINE(u_int32_t, dyn_ack_lifetime); +static VNET_DEFINE(u_int32_t, dyn_syn_lifetime); +static VNET_DEFINE(u_int32_t, dyn_fin_lifetime); +static VNET_DEFINE(u_int32_t, dyn_rst_lifetime); +static VNET_DEFINE(u_int32_t, dyn_udp_lifetime); +static VNET_DEFINE(u_int32_t, dyn_short_lifetime); #define V_dyn_ack_lifetime VNET(dyn_ack_lifetime) #define V_dyn_syn_lifetime VNET(dyn_syn_lifetime) @@ -172,16 +172,16 @@ STATIC_VNET_DEFINE(u_int32_t, dyn_short_lifetime); * than dyn_keepalive_period. */ -STATIC_VNET_DEFINE(u_int32_t, dyn_keepalive_interval); -STATIC_VNET_DEFINE(u_int32_t, dyn_keepalive_period); -STATIC_VNET_DEFINE(u_int32_t, dyn_keepalive); +static VNET_DEFINE(u_int32_t, dyn_keepalive_interval); +static VNET_DEFINE(u_int32_t, dyn_keepalive_period); +static VNET_DEFINE(u_int32_t, dyn_keepalive); #define V_dyn_keepalive_interval VNET(dyn_keepalive_interval) #define V_dyn_keepalive_period VNET(dyn_keepalive_period) #define V_dyn_keepalive VNET(dyn_keepalive) -STATIC_VNET_DEFINE(u_int32_t, dyn_count); /* # of dynamic rules */ -STATIC_VNET_DEFINE(u_int32_t, dyn_max); /* max # of dynamic rules */ +static VNET_DEFINE(u_int32_t, dyn_count); /* # of dynamic rules */ +static VNET_DEFINE(u_int32_t, dyn_max); /* max # of dynamic rules */ #define V_dyn_count VNET(dyn_count) #define V_dyn_max VNET(dyn_max) diff --git a/sys/netinet/ipfw/ip_fw_nat.c b/sys/netinet/ipfw/ip_fw_nat.c index 9fa8602..6f223ed 100644 --- a/sys/netinet/ipfw/ip_fw_nat.c +++ b/sys/netinet/ipfw/ip_fw_nat.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include <machine/in_cksum.h> /* XXX for in_cksum */ -STATIC_VNET_DEFINE(eventhandler_tag, ifaddr_event_tag); +static VNET_DEFINE(eventhandler_tag, ifaddr_event_tag); #define V_ifaddr_event_tag VNET(ifaddr_event_tag) static void diff --git a/sys/netinet/ipfw/ip_fw_pfil.c b/sys/netinet/ipfw/ip_fw_pfil.c index f15a969..248e4dd 100644 --- a/sys/netinet/ipfw/ip_fw_pfil.c +++ b/sys/netinet/ipfw/ip_fw_pfil.c @@ -63,11 +63,11 @@ __FBSDID("$FreeBSD$"); #include <machine/in_cksum.h> -STATIC_VNET_DEFINE(int, fw_enable) = 1; +static VNET_DEFINE(int, fw_enable) = 1; #define V_fw_enable VNET(fw_enable) #ifdef INET6 -STATIC_VNET_DEFINE(int, fw6_enable) = 1; +static VNET_DEFINE(int, fw6_enable) = 1; #define V_fw6_enable VNET(fw6_enable) #endif |
