examples: nft-table-upd: don't use deprecated aliases
Pablo Neira Ayuso
maintainerPATCH 1/2 examples: nft-table-upd: don't use deprecated aliases
Convert this example not to use the deprecated aliases anymore.
---
This is a leftover from previous conversion.
examples/nft-table-upd.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
examples/nft-table-upd.c +10 -10
@@ -26,7 +26,7 @@ int main(int argc, char *argv[])char buf[MNL_SOCKET_BUFFER_SIZE ];struct nlmsghdr *nlh;uint32_t portid, seq, table_seq, family, flags; -struct nft_table *t =NULL ; +struct nftnl_table *t =NULL ;struct mnl_nlmsg_batch *batch;int ret, batching;
@@ -35,13 +35,13 @@ int main(int argc, char *argv[])exit (EXIT_FAILURE ); } - t =nft_table_alloc (); + t =nftnl_table_alloc ();if (t ==NULL ) {perror ("OOM" );exit (EXIT_FAILURE ); } - batching =nft_batch_is_supported (); + batching =nftnl_batch_is_supported ();if (batching <0 ) {perror ("cannot talk to nfnetlink" );exit (EXIT_FAILURE );
@@ -51,7 +51,7 @@ int main(int argc, char *argv[]) batch =mnl_nlmsg_batch_start (buf,sizeof (buf));if (batching) { -nft_batch_begin (mnl_nlmsg_batch_current (batch), seq++); +nftnl_batch_begin (mnl_nlmsg_batch_current (batch), seq++);mnl_nlmsg_batch_next (batch); }
@@ -80,19 +80,19 @@ int main(int argc, char *argv[])exit (EXIT_FAILURE ); } -nft_table_attr_set (t,NFT_TABLE_ATTR_NAME , argv[2 ]); -nft_table_attr_set_u32 (t,NFT_TABLE_ATTR_FLAGS , flags); +nftnl_table_set (t,NFTNL_TABLE_NAME , argv[2 ]); +nftnl_table_set_u32 (t,NFTNL_TABLE_FLAGS , flags); table_seq = seq; - nlh =nft_table_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), + nlh =nftnl_table_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch),NFT_MSG_NEWTABLE , family,NLM_F_ACK , seq++); -nft_table_nlmsg_build_payload (nlh, t); -nft_table_free (t); +nftnl_table_nlmsg_build_payload (nlh, t); +nftnl_table_free (t);mnl_nlmsg_batch_next (batch);if (batching) { -nft_batch_end (mnl_nlmsg_batch_current (batch), seq++); +nftnl_batch_end (mnl_nlmsg_batch_current (batch), seq++);mnl_nlmsg_batch_next (batch); }
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 2/2 src: get rid of EXPORT_SYMBOL_ALIAS()
This machinery was introduced to avoid sudden compilation breakage of old nftables releases. With the release of 0.6 (and 0.5 which is now 9 months old) this is not required anymore. Moreover, users gain nothing from older releases since they are half-boiled and full of bugs.
So let's get rid of this aliases now. Bump LIBVERSION and update map file.
--- Make_global.am | 2 +- doxygen.cfg.in | 2 +- include/utils.h | 2 - src/batch.c | 14 +-- src/chain.c | 68 +++++++------- src/common.c | 14 +-- src/expr.c | 32 +++---- src/gen.c | 26 +++--- src/libnftnl.map | 265 +------------------------------------------------------ src/rule.c | 74 ++++++++-------- src/ruleset.c | 32 +++---- src/set.c | 64 +++++++------- src/set_elem.c | 48 +++++----- src/table.c | 60 ++++++------- 14 files changed, 220 insertions(+), 483 deletions(-)
Make_global.am +1 -1
@@ -18,7 +18,7 @@ # set age to 0. # </snippet> # -LIBVERSION=5:0:1 +LIBVERSION=6:0:0 AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS} ${LIBMXML_CFLAGS} AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN}
doxygen.cfg.in +1 -1
@@ -72,7 +72,7 @@ RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = */.git/* .*.d -EXCLUDE_SYMBOLS = EXPORT_SYMBOL EXPORT_SYMBOL_ALIAS nft_table +EXCLUDE_SYMBOLS = EXPORT_SYMBOL EXAMPLE_PATH = EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO
include/utils.h +0 -2
@@ -11,10 +11,8 @@#ifdef HAVE_VISIBILITY_HIDDEN # define __visible __attribute__((visibility("default")))# define EXPORT_SYMBOL (x) typeof(x) (x) __visible; -# define EXPORT_SYMBOL_ALIAS (x, y) typeof(x) (x) __visible; __typeof (y) y __attribute ((alias (#x), visibility ("default")))#else # define EXPORT_SYMBOL -# define EXPORT_SYMBOL_ALIAS #endif #define __noreturn __attribute__((__noreturn__))
src/batch.c +7 -7
@@ -80,7 +80,7 @@ err1:free (batch);return NULL ; } -EXPORT_SYMBOL_ALIAS (nftnl_batch_alloc, nft_batch_alloc); +EXPORT_SYMBOL (nftnl_batch_alloc);void nftnl_batch_free (struct nftnl_batch *batch) {
@@ -94,7 +94,7 @@ void nftnl_batch_free(struct nftnl_batch *batch)free (batch); } -EXPORT_SYMBOL_ALIAS (nftnl_batch_free, nft_batch_free); +EXPORT_SYMBOL (nftnl_batch_free);int nftnl_batch_update (struct nftnl_batch *batch) {
@@ -119,19 +119,19 @@ int nftnl_batch_update(struct nftnl_batch *batch) err1:return -1 ; } -EXPORT_SYMBOL_ALIAS (nftnl_batch_update, nft_batch_update); +EXPORT_SYMBOL (nftnl_batch_update);void *nftnl_batch_buffer (struct nftnl_batch *batch) {return mnl_nlmsg_batch_current (batch->current_page->batch); } -EXPORT_SYMBOL_ALIAS (nftnl_batch_buffer, nft_batch_buffer); +EXPORT_SYMBOL (nftnl_batch_buffer);uint32_t nftnl_batch_buffer_len (struct nftnl_batch *batch) {return mnl_nlmsg_batch_size (batch->current_page->batch); } -EXPORT_SYMBOL_ALIAS (nftnl_batch_buffer_len, nft_batch_buffer_len); +EXPORT_SYMBOL (nftnl_batch_buffer_len);int nftnl_batch_iovec_len (struct nftnl_batch *batch) {
@@ -143,7 +143,7 @@ int nftnl_batch_iovec_len(struct nftnl_batch *batch)return num_pages; } -EXPORT_SYMBOL_ALIAS (nftnl_batch_iovec_len, nft_batch_iovec_len); +EXPORT_SYMBOL (nftnl_batch_iovec_len);void nftnl_batch_iovec (struct nftnl_batch *batch,struct iovec *iov,uint32_t iovlen)
@@ -160,4 +160,4 @@ void nftnl_batch_iovec(struct nftnl_batch *batch, struct iovec *iov, i++; } } -EXPORT_SYMBOL_ALIAS (nftnl_batch_iovec, nft_batch_iovec); +EXPORT_SYMBOL (nftnl_batch_iovec);
src/chain.c +34 -34
256 lines not on this page · raw message
src/common.c +7 -7
@@ -40,7 +40,7 @@ struct nlmsghdr *nftnl_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family,return nlh; } -EXPORT_SYMBOL_ALIAS (nftnl_nlmsg_build_hdr, nft_nlmsg_build_hdr); +EXPORT_SYMBOL (nftnl_nlmsg_build_hdr);struct nftnl_parse_err *nftnl_parse_err_alloc (void ) {
@@ -54,13 +54,13 @@ struct nftnl_parse_err *nftnl_parse_err_alloc(void)return err; } -EXPORT_SYMBOL_ALIAS (nftnl_parse_err_alloc, nft_parse_err_alloc); +EXPORT_SYMBOL (nftnl_parse_err_alloc);void nftnl_parse_err_free (struct nftnl_parse_err *err) {xfree (err); } -EXPORT_SYMBOL_ALIAS (nftnl_parse_err_free, nft_parse_err_free); +EXPORT_SYMBOL (nftnl_parse_err_free);int nftnl_parse_perror (const char *msg,struct nftnl_parse_err *err) {
@@ -80,7 +80,7 @@ int nftnl_parse_perror(const char *msg, struct nftnl_parse_err *err)return fprintf (stderr,"%s: Undefined error\n" , msg); } } -EXPORT_SYMBOL_ALIAS (nftnl_parse_perror, nft_parse_perror); +EXPORT_SYMBOL (nftnl_parse_perror);int nftnl_cmd_header_snprintf (char *buf,size_t size,uint32_t cmd,uint32_t type,uint32_t flags)
@@ -176,13 +176,13 @@ void nftnl_batch_begin(char *buf, uint32_t seq) {nftnl_batch_build_hdr (buf,NFNL_MSG_BATCH_BEGIN , seq); } -EXPORT_SYMBOL_ALIAS (nftnl_batch_begin, nft_batch_begin); +EXPORT_SYMBOL (nftnl_batch_begin);void nftnl_batch_end (char *buf,uint32_t seq) {nftnl_batch_build_hdr (buf,NFNL_MSG_BATCH_END , seq); } -EXPORT_SYMBOL_ALIAS (nftnl_batch_end, nft_batch_end); +EXPORT_SYMBOL (nftnl_batch_end);int nftnl_batch_is_supported (void ) {
@@ -241,4 +241,4 @@ err:mnl_nlmsg_batch_stop (b);return -1 ; } -EXPORT_SYMBOL_ALIAS (nftnl_batch_is_supported, nft_batch_is_supported); +EXPORT_SYMBOL (nftnl_batch_is_supported);
src/expr.c +16 -16
@@ -43,7 +43,7 @@ struct nftnl_expr *nftnl_expr_alloc(const char *name)return expr; } -EXPORT_SYMBOL_ALIAS (nftnl_expr_alloc, nft_rule_expr_alloc); +EXPORT_SYMBOL (nftnl_expr_alloc);void nftnl_expr_free (const struct nftnl_expr *expr) {
@@ -52,13 +52,13 @@ void nftnl_expr_free(const struct nftnl_expr *expr)xfree (expr); } -EXPORT_SYMBOL_ALIAS (nftnl_expr_free, nft_rule_expr_free); +EXPORT_SYMBOL (nftnl_expr_free);bool nftnl_expr_is_set (const struct nftnl_expr *expr,uint16_t type) {return expr->flags & (1 << type); } -EXPORT_SYMBOL_ALIAS (nftnl_expr_is_set, nft_rule_expr_is_set); +EXPORT_SYMBOL (nftnl_expr_is_set); void nftnl_expr_set(struct nftnl_expr *expr, uint16_t type,
@@ -73,42 +73,42 @@ nftnl_expr_set(struct nftnl_expr *expr, uint16_t type, } expr->flags |= (1 << type); } -EXPORT_SYMBOL_ALIAS (nftnl_expr_set, nft_rule_expr_set); +EXPORT_SYMBOL (nftnl_expr_set);void nftnl_expr_set_u8 (struct nftnl_expr *expr,uint16_t type,uint8_t data) {nftnl_expr_set (expr, type, &data,sizeof (uint8_t )); } -EXPORT_SYMBOL_ALIAS (nftnl_expr_set_u8, nft_rule_expr_set_u8); +EXPORT_SYMBOL (nftnl_expr_set_u8);void nftnl_expr_set_u16 (struct nftnl_expr *expr,uint16_t type,uint16_t data) {nftnl_expr_set (expr, type, &data,sizeof (uint16_t )); } -EXPORT_SYMBOL_ALIAS (nftnl_expr_set_u16, nft_rule_expr_set_u16); +EXPORT_SYMBOL (nftnl_expr_set_u16);void nftnl_expr_set_u32 (struct nftnl_expr *expr,uint16_t type,uint32_t data) {nftnl_expr_set (expr, type, &data,sizeof (uint32_t )); } -EXPORT_SYMBOL_ALIAS (nftnl_expr_set_u32, nft_rule_expr_set_u32); +EXPORT_SYMBOL (nftnl_expr_set_u32);void nftnl_expr_set_u64 (struct nftnl_expr *expr,uint16_t type,uint64_t data) {nftnl_expr_set (expr, type, &data,sizeof (uint64_t )); } -EXPORT_SYMBOL_ALIAS (nftnl_expr_set_u64, nft_rule_expr_set_u64); +EXPORT_SYMBOL (nftnl_expr_set_u64);void nftnl_expr_set_str (struct nftnl_expr *expr,uint16_t type,const char *str) {nftnl_expr_set (expr, type, str,strlen (str)+1 ); } -EXPORT_SYMBOL_ALIAS (nftnl_expr_set_str, nft_rule_expr_set_str); +EXPORT_SYMBOL (nftnl_expr_set_str);const void *nftnl_expr_get (const struct nftnl_expr *expr,uint16_t type,uint32_t *data_len)
@@ -129,7 +129,7 @@ const void *nftnl_expr_get(const struct nftnl_expr *expr,return ret; } -EXPORT_SYMBOL_ALIAS (nftnl_expr_get, nft_rule_expr_get); +EXPORT_SYMBOL (nftnl_expr_get);uint8_t nftnl_expr_get_u8 (const struct nftnl_expr *expr,uint16_t type) {
@@ -145,7 +145,7 @@ uint8_t nftnl_expr_get_u8(const struct nftnl_expr *expr, uint16_t type)return *((uint8_t *)data); } -EXPORT_SYMBOL_ALIAS (nftnl_expr_get_u8, nft_rule_expr_get_u8); +EXPORT_SYMBOL (nftnl_expr_get_u8);uint16_t nftnl_expr_get_u16 (const struct nftnl_expr *expr,uint16_t type) {
@@ -161,7 +161,7 @@ uint16_t nftnl_expr_get_u16(const struct nftnl_expr *expr, uint16_t type)return *((uint16_t *)data); } -EXPORT_SYMBOL_ALIAS (nftnl_expr_get_u16, nft_rule_expr_get_u16); +EXPORT_SYMBOL (nftnl_expr_get_u16);uint32_t nftnl_expr_get_u32 (const struct nftnl_expr *expr,uint16_t type) {
@@ -177,7 +177,7 @@ uint32_t nftnl_expr_get_u32(const struct nftnl_expr *expr, uint16_t type)return *((uint32_t *)data); } -EXPORT_SYMBOL_ALIAS (nftnl_expr_get_u32, nft_rule_expr_get_u32); +EXPORT_SYMBOL (nftnl_expr_get_u32);uint64_t nftnl_expr_get_u64 (const struct nftnl_expr *expr,uint16_t type) {
@@ -193,7 +193,7 @@ uint64_t nftnl_expr_get_u64(const struct nftnl_expr *expr, uint16_t type)return *((uint64_t *)data); } -EXPORT_SYMBOL_ALIAS (nftnl_expr_get_u64, nft_rule_expr_get_u64); +EXPORT_SYMBOL (nftnl_expr_get_u64);const char *nftnl_expr_get_str (const struct nftnl_expr *expr,uint16_t type) {
@@ -201,7 +201,7 @@ const char *nftnl_expr_get_str(const struct nftnl_expr *expr, uint16_t type)return (const char *)nftnl_expr_get (expr, type, &data_len); } -EXPORT_SYMBOL_ALIAS (nftnl_expr_get_str, nft_rule_expr_get_str); +EXPORT_SYMBOL (nftnl_expr_get_str);void nftnl_expr_build_payload (struct nlmsghdr *nlh,struct nftnl_expr *expr)
@@ -273,4 +273,4 @@ int nftnl_expr_snprintf(char *buf, size_t size, const struct nftnl_expr *expr,return offset; } -EXPORT_SYMBOL_ALIAS (nftnl_expr_snprintf, nft_rule_expr_snprintf); +EXPORT_SYMBOL (nftnl_expr_snprintf);
src/gen.c +13 -13
@@ -33,19 +33,19 @@ struct nftnl_gen *nftnl_gen_alloc(void) {return calloc (1 ,sizeof (struct nftnl_gen )); } -EXPORT_SYMBOL_ALIAS (nftnl_gen_alloc, nft_gen_alloc); +EXPORT_SYMBOL (nftnl_gen_alloc);void nftnl_gen_free (const struct nftnl_gen *gen) {xfree (gen); } -EXPORT_SYMBOL_ALIAS (nftnl_gen_free, nft_gen_free); +EXPORT_SYMBOL (nftnl_gen_free);bool nftnl_gen_is_set (const struct nftnl_gen *gen,uint16_t attr) {return gen->flags & (1 << attr); } -EXPORT_SYMBOL_ALIAS (nftnl_gen_is_set, nft_gen_attr_is_set); +EXPORT_SYMBOL (nftnl_gen_is_set);void nftnl_gen_unset (struct nftnl_gen *gen,uint16_t attr) {
@@ -58,7 +58,7 @@ void nftnl_gen_unset(struct nftnl_gen *gen, uint16_t attr) } gen->flags &= ~(1 << attr); } -EXPORT_SYMBOL_ALIAS (nftnl_gen_unset, nft_gen_attr_unset); +EXPORT_SYMBOL (nftnl_gen_unset);static uint32_t nftnl_gen_validate[NFTNL_GEN_MAX +1 ] = { [NFTNL_GEN_ID ] =sizeof (uint32_t ),
@@ -79,19 +79,19 @@ void nftnl_gen_set_data(struct nftnl_gen *gen, uint16_t attr, } gen->flags |= (1 << attr); } -EXPORT_SYMBOL_ALIAS (nftnl_gen_set_data, nft_gen_attr_set_data); +EXPORT_SYMBOL (nftnl_gen_set_data);void nftnl_gen_set (struct nftnl_gen *gen,uint16_t attr,const void *data) {nftnl_gen_set_data (gen, attr, data, nftnl_gen_validate[attr]); } -EXPORT_SYMBOL_ALIAS (nftnl_gen_set, nft_gen_attr_set); +EXPORT_SYMBOL (nftnl_gen_set);void nftnl_gen_set_u32 (struct nftnl_gen *gen,uint16_t attr,uint32_t val) {nftnl_gen_set_data (gen, attr, &val,sizeof (uint32_t )); } -EXPORT_SYMBOL_ALIAS (nftnl_gen_set_u32, nft_gen_attr_set_u32); +EXPORT_SYMBOL (nftnl_gen_set_u32);const void *nftnl_gen_get_data (const struct nftnl_gen *gen,uint16_t attr,uint32_t *data_len)
@@ -105,21 +105,21 @@ const void *nftnl_gen_get_data(const struct nftnl_gen *gen, uint16_t attr, }return NULL ; } -EXPORT_SYMBOL_ALIAS (nftnl_gen_get_data, nft_gen_attr_get_data); +EXPORT_SYMBOL (nftnl_gen_get_data);const void *nftnl_gen_get (const struct nftnl_gen *gen,uint16_t attr) {uint32_t data_len;return nftnl_gen_get_data (gen, attr, &data_len); } -EXPORT_SYMBOL_ALIAS (nftnl_gen_get, nft_gen_attr_get); +EXPORT_SYMBOL (nftnl_gen_get);uint32_t nftnl_gen_get_u32 (const struct nftnl_gen *gen,uint16_t attr) {const void *ret =nftnl_gen_get (gen, attr);return ret ==NULL ?0 : *((uint32_t *)ret); } -EXPORT_SYMBOL_ALIAS (nftnl_gen_get_u32, nft_gen_attr_get_u32); +EXPORT_SYMBOL (nftnl_gen_get_u32);static int nftnl_gen_parse_attr_cb (const struct nlattr *attr,void *data) {
@@ -154,7 +154,7 @@ int nftnl_gen_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_gen *gen) }return 0 ; } -EXPORT_SYMBOL_ALIAS (nftnl_gen_nlmsg_parse, nft_gen_nlmsg_parse); +EXPORT_SYMBOL (nftnl_gen_nlmsg_parse);static int nftnl_gen_snprintf_default (char *buf,size_t size,const struct nftnl_gen *gen)
@@ -192,7 +192,7 @@ int nftnl_gen_snprintf(char *buf, size_t size, const struct nftnl_gen *gen,return nftnl_gen_cmd_snprintf (buf, size, gen,nftnl_flag2cmd (flags), type, flags); } -EXPORT_SYMBOL_ALIAS (nftnl_gen_snprintf, nft_gen_snprintf); +EXPORT_SYMBOL (nftnl_gen_snprintf);static int nftnl_gen_do_snprintf (char *buf,size_t size,const void *gen,uint32_t cmd,uint32_t type,uint32_t flags)
@@ -206,4 +206,4 @@ int nftnl_gen_fprintf(FILE *fp, const struct nftnl_gen *gen, uint32_t type,return nftnl_fprintf (fp, gen,NFTNL_CMD_UNSPEC , type, flags, nftnl_gen_do_snprintf); } -EXPORT_SYMBOL_ALIAS (nftnl_gen_fprintf, nft_gen_fprintf); +EXPORT_SYMBOL (nftnl_gen_fprintf);
src/libnftnl.map +2 -263
296 lines not on this page · raw message
src/rule.c +37 -37
279 lines not on this page · raw message
src/ruleset.c +16 -16
@@ -62,7 +62,7 @@ struct nftnl_ruleset *nftnl_ruleset_alloc(void) {return calloc (1 ,sizeof (struct nftnl_ruleset )); } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_alloc, nft_ruleset_alloc); +EXPORT_SYMBOL (nftnl_ruleset_alloc);void nftnl_ruleset_free (const struct nftnl_ruleset *r) {
@@ -76,13 +76,13 @@ void nftnl_ruleset_free(const struct nftnl_ruleset *r)nftnl_rule_list_free (r->rule_list);xfree (r); } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_free, nft_ruleset_free); +EXPORT_SYMBOL (nftnl_ruleset_free);bool nftnl_ruleset_is_set (const struct nftnl_ruleset *r,uint16_t attr) {return r->flags & (1 << attr); } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_is_set, nft_ruleset_attr_is_set); +EXPORT_SYMBOL (nftnl_ruleset_is_set);void nftnl_ruleset_unset (struct nftnl_ruleset *r,uint16_t attr) {
@@ -109,7 +109,7 @@ void nftnl_ruleset_unset(struct nftnl_ruleset *r, uint16_t attr) } r->flags &= ~(1 << attr); } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_unset, nft_ruleset_attr_unset); +EXPORT_SYMBOL (nftnl_ruleset_unset);void nftnl_ruleset_set (struct nftnl_ruleset *r,uint16_t attr,void *data) {
@@ -135,7 +135,7 @@ void nftnl_ruleset_set(struct nftnl_ruleset *r, uint16_t attr, void *data) } r->flags |= (1 << attr); } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_set, nft_ruleset_attr_set); +EXPORT_SYMBOL (nftnl_ruleset_set);void *nftnl_ruleset_get (const struct nftnl_ruleset *r,uint16_t attr) {
@@ -155,7 +155,7 @@ void *nftnl_ruleset_get(const struct nftnl_ruleset *r, uint16_t attr)return NULL ; } } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_get, nft_ruleset_attr_get); +EXPORT_SYMBOL (nftnl_ruleset_get);void nftnl_ruleset_ctx_free (const struct nftnl_parse_ctx *ctx) {
@@ -178,13 +178,13 @@ void nftnl_ruleset_ctx_free(const struct nftnl_parse_ctx *ctx)break ; } } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_ctx_free, nft_ruleset_ctx_free); +EXPORT_SYMBOL (nftnl_ruleset_ctx_free);bool nftnl_ruleset_ctx_is_set (const struct nftnl_parse_ctx *ctx,uint16_t attr) {return ctx->flags & (1 << attr); } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_ctx_is_set, nft_ruleset_ctx_is_set); +EXPORT_SYMBOL (nftnl_ruleset_ctx_is_set);void *nftnl_ruleset_ctx_get (const struct nftnl_parse_ctx *ctx,uint16_t attr) {
@@ -210,14 +210,14 @@ void *nftnl_ruleset_ctx_get(const struct nftnl_parse_ctx *ctx, uint16_t attr)return NULL ; } } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_ctx_get, nft_ruleset_ctx_get); +EXPORT_SYMBOL (nftnl_ruleset_ctx_get);uint32_t nftnl_ruleset_ctx_get_u32 (const struct nftnl_parse_ctx *ctx,uint16_t attr) {const void *ret =nftnl_ruleset_ctx_get (ctx, attr);return ret ==NULL ?0 : *((uint32_t *)ret); } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_ctx_get_u32, nft_ruleset_ctx_get_u32); +EXPORT_SYMBOL (nftnl_ruleset_ctx_get_u32);#if defined(JSON_PARSING ) || defined(XML_PARSING ) static void nftnl_ruleset_ctx_set(struct nftnl_parse_ctx *ctx, uint16_t attr,
@@ -751,7 +751,7 @@ int nftnl_ruleset_parse_file_cb(enum nftnl_parse_type type, FILE *fp, {return nftnl_ruleset_do_parse (type, fp, err,NFTNL_PARSE_FILE , data, cb); } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_parse_file_cb, nft_ruleset_parse_file_cb); +EXPORT_SYMBOL (nftnl_ruleset_parse_file_cb); int nftnl_ruleset_parse_buffer_cb(enum nftnl_parse_type type, const char *buffer, struct nftnl_parse_err *err, void *data,
@@ -760,7 +760,7 @@ int nftnl_ruleset_parse_buffer_cb(enum nftnl_parse_type type, const char *bufferreturn nftnl_ruleset_do_parse (type, buffer, err,NFTNL_PARSE_BUFFER , data, cb); } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_parse_buffer_cb, nft_ruleset_parse_buffer_cb); +EXPORT_SYMBOL (nftnl_ruleset_parse_buffer_cb);static int nftnl_ruleset_cb (const struct nftnl_parse_ctx *ctx) {
@@ -828,14 +828,14 @@ int nftnl_ruleset_parse(struct nftnl_ruleset *r, enum nftnl_parse_type type, {return nftnl_ruleset_parse_buffer_cb (type, data, err, r, nftnl_ruleset_cb); } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_parse, nft_ruleset_parse); +EXPORT_SYMBOL (nftnl_ruleset_parse);int nftnl_ruleset_parse_file (struct nftnl_ruleset *rs,enum nftnl_parse_type type,FILE *fp,struct nftnl_parse_err *err) {return nftnl_ruleset_parse_file_cb (type, fp, err, rs, nftnl_ruleset_cb); } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_parse_file, nft_ruleset_parse_file); +EXPORT_SYMBOL (nftnl_ruleset_parse_file);static const char *nftnl_ruleset_o_opentag (uint32_t type) {
@@ -1097,7 +1097,7 @@ int nftnl_ruleset_snprintf(char *buf, size_t size, const struct nftnl_ruleset *rreturn -1 ; } } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_snprintf, nft_ruleset_snprintf); +EXPORT_SYMBOL (nftnl_ruleset_snprintf);static int nftnl_ruleset_fprintf_tables (FILE *fp,const struct nftnl_ruleset *rs,uint32_t type,uint32_t flags)
@@ -1317,4 +1317,4 @@ int nftnl_ruleset_fprintf(FILE *fp, const struct nftnl_ruleset *rs, uint32_t typreturn nftnl_ruleset_cmd_fprintf (fp, rs,nftnl_flag2cmd (flags), type, flags); } -EXPORT_SYMBOL_ALIAS (nftnl_ruleset_fprintf, nft_ruleset_fprintf); +EXPORT_SYMBOL (nftnl_ruleset_fprintf);
src/set.c +32 -32
243 lines not on this page · raw message
src/set_elem.c +24 -24
183 lines not on this page · raw message
src/table.c +30 -30
226 lines not on this page · raw message
Signature · 1 line
2.1.4