From 23b06d8ace9fc2e9bcfa5d1ce11247505bd4dfde Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Wed, 7 Oct 2015 18:10:36 +0200 Subject: [PATCH] kernel/ipfw3: Some build fixes. * ipfw_ctx is now used by another file in the module, so un-staticize it. * Add the new file to sys/conf/files so that building ipfw3 into the kernel with "options IPFIREWALL3" doesn't break. --- sys/conf/files | 1 + sys/net/ipfw3/ip_fw3.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/conf/files b/sys/conf/files index 37daad2ddd..bd4a47bebb 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1517,6 +1517,7 @@ net/ipfw/ip_fw2.c optional ipfirewall net/ipfw/ip_fw2_glue.c optional inet net/ipfw3/ip_fw3.c optional ipfirewall3 net/ipfw3/ip_fw3_glue.c optional inet +net/ipfw3/ip_fw3_table.c optional ipfirewall3 netinet/ip_icmp.c optional inet netinet/ip_input.c optional inet netinet/ip_demux.c optional inet diff --git a/sys/net/ipfw3/ip_fw3.c b/sys/net/ipfw3/ip_fw3.c index 39d71949b2..0772b8df39 100644 --- a/sys/net/ipfw3/ip_fw3.c +++ b/sys/net/ipfw3/ip_fw3.c @@ -143,7 +143,6 @@ ipfw_nat_cfg_t *ipfw_nat_get_log_ptr; ipfw_basic_delete_state_t *ipfw_basic_flush_state_prt = NULL; ipfw_basic_append_state_t *ipfw_basic_append_state_prt = NULL; -static struct ipfw_context *ipfw_ctx[MAXCPU]; static struct ipfw_nat_context *ipfw_nat_ctx; extern int ip_fw_loaded; @@ -178,6 +177,7 @@ SYSCTL_INT(_net_inet_ip_fw3, OID_AUTO, static_count, CTLFLAG_RD, filter_func filter_funcs[MAX_MODULE][MAX_OPCODE_PER_MODULE]; struct ipfw_module ipfw_modules[MAX_MODULE]; +struct ipfw_context *ipfw_ctx[MAXCPU]; static int ipfw_ctl(struct sockopt *sopt); -- 2.41.0