diff options
author | Phil Sutter <phil@nwl.cc> | 2018-05-08 13:08:34 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-05-11 12:16:51 +0200 |
commit | f4c87d0a7037188ff69dff29d5154a102230b792 (patch) | |
tree | 13a4835de58c25faa0fbafa01e4dd6e67ef654d7 /src | |
parent | 08c11bc3b329523332f0d7e0eadf6bd4260de67c (diff) |
libnftables: Make some arrays globally accessible
This removes static flag and adds declarations in headers for the
following arrays:
* ct_templates from src/ct.c
* mark_tbl from src/datatype.c
* meta_templates and devgroup_tbl from src/meta.c
* table_flags_name from src/rule.c
* set_stmt_op_names from src/statement.c
* tcpopthdr_protocols from src/tcpopt.c
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/ct.c | 2 | ||||
-rw-r--r-- | src/datatype.c | 3 | ||||
-rw-r--r-- | src/meta.c | 5 | ||||
-rw-r--r-- | src/rt.c | 2 | ||||
-rw-r--r-- | src/rule.c | 2 | ||||
-rw-r--r-- | src/statement.c | 2 | ||||
-rw-r--r-- | src/tcpopt.c | 2 |
7 files changed, 9 insertions, 9 deletions
@@ -220,7 +220,7 @@ void ct_label_table_exit(void) #define NF_CT_HELPER_NAME_LEN 16 #endif -static const struct ct_template ct_templates[] = { +const struct ct_template ct_templates[__NFT_CT_MAX] = { [NFT_CT_STATE] = CT_TEMPLATE("state", &ct_state_type, BYTEORDER_HOST_ENDIAN, 4 * BITS_PER_BYTE), diff --git a/src/datatype.c b/src/datatype.c index 4248f7e4..d5a5091e 100644 --- a/src/datatype.c +++ b/src/datatype.c @@ -721,7 +721,8 @@ void rt_symbol_table_free(struct symbol_table *tbl) xfree(tbl); } -static struct symbol_table *mark_tbl; +struct symbol_table *mark_tbl = NULL; + void mark_table_init(void) { mark_tbl = rt_symbol_table_init("/etc/iproute2/rt_marks"); @@ -334,7 +334,8 @@ const struct datatype pkttype_type = { .sym_tbl = &pkttype_type_tbl, }; -static struct symbol_table *devgroup_tbl; +struct symbol_table *devgroup_tbl = NULL; + void devgroup_table_init(void) { devgroup_tbl = rt_symbol_table_init("/etc/iproute2/group"); @@ -378,7 +379,7 @@ const struct datatype ifname_type = { .basetype = &string_type, }; -static const struct meta_template meta_templates[] = { +const struct meta_template meta_templates[] = { [NFT_META_LEN] = META_TEMPLATE("length", &integer_type, 4 * 8, BYTEORDER_HOST_ENDIAN), [NFT_META_PROTOCOL] = META_TEMPLATE("protocol", ðertype_type, @@ -57,7 +57,7 @@ const struct datatype realm_type = { .flags = DTYPE_F_PREFIX, }; -static const struct rt_template rt_templates[] = { +const struct rt_template rt_templates[] = { [NFT_RT_CLASSID] = RT_TEMPLATE("classid", &realm_type, 4 * BITS_PER_BYTE, @@ -856,8 +856,6 @@ struct table *table_lookup(const struct handle *h, return NULL; } -#define TABLE_FLAGS_MAX 1 - const char *table_flags_name[TABLE_FLAGS_MAX] = { "dormant", }; diff --git a/src/statement.c b/src/statement.c index 19c30cf8..a5ef7d7d 100644 --- a/src/statement.c +++ b/src/statement.c @@ -567,7 +567,7 @@ struct stmt *nat_stmt_alloc(const struct location *loc, return stmt; } -static const char * const set_stmt_op_names[] = { +const char * const set_stmt_op_names[] = { [NFT_DYNSET_OP_ADD] = "add", [NFT_DYNSET_OP_UPDATE] = "update", }; diff --git a/src/tcpopt.c b/src/tcpopt.c index 7c6c2557..66f021f9 100644 --- a/src/tcpopt.c +++ b/src/tcpopt.c @@ -136,7 +136,7 @@ static unsigned int calc_offset_reverse(const struct exthdr_desc *desc, } } -static const struct exthdr_desc *tcpopthdr_protocols[] = { +const struct exthdr_desc *tcpopthdr_protocols[__TCPOPTHDR_MAX] = { [TCPOPTHDR_EOL] = &tcpopt_eol, [TCPOPTHDR_NOOP] = &tcpopt_nop, [TCPOPTHDR_MAXSEG] = &tcptopt_maxseg, |