From 907a9f8e5a93f5bcd449643eb3916a656d634758 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 20 Dec 2016 13:47:11 +0100 Subject: src: get rid of aliases and compat This machinery was introduced to avoid sudden compilation breakage of old nftables releases. With the upcoming release of 0.7 (and 0.6 which is now 6 months old) this is not required anymore. Moreover, users gain nothing from older releases since they are half-boiled and buggy. So let's get rid of aliases now. Bump LIBVERSION and update map file. Signed-off-by: Pablo Neira Ayuso --- src/rule.c | 74 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'src/rule.c') diff --git a/src/rule.c b/src/rule.c index 22026a4..02d013b 100644 --- a/src/rule.c +++ b/src/rule.c @@ -62,7 +62,7 @@ struct nftnl_rule *nftnl_rule_alloc(void) return r; } -EXPORT_SYMBOL_ALIAS(nftnl_rule_alloc, nft_rule_alloc); +EXPORT_SYMBOL(nftnl_rule_alloc); void nftnl_rule_free(const struct nftnl_rule *r) { @@ -80,13 +80,13 @@ void nftnl_rule_free(const struct nftnl_rule *r) xfree(r); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_free, nft_rule_free); +EXPORT_SYMBOL(nftnl_rule_free); bool nftnl_rule_is_set(const struct nftnl_rule *r, uint16_t attr) { return r->flags & (1 << attr); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_is_set, nft_rule_attr_is_set); +EXPORT_SYMBOL(nftnl_rule_is_set); void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr) { @@ -113,7 +113,7 @@ void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr) r->flags &= ~(1 << attr); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_unset, nft_rule_attr_unset); +EXPORT_SYMBOL(nftnl_rule_unset); static uint32_t nftnl_rule_validate[NFTNL_RULE_MAX + 1] = { [NFTNL_RULE_HANDLE] = sizeof(uint64_t), @@ -176,31 +176,31 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, r->flags |= (1 << attr); return 0; } -EXPORT_SYMBOL_ALIAS(nftnl_rule_set_data, nft_rule_attr_set_data); +EXPORT_SYMBOL(nftnl_rule_set_data); int nftnl_rule_set(struct nftnl_rule *r, uint16_t attr, const void *data) { return nftnl_rule_set_data(r, attr, data, nftnl_rule_validate[attr]); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_set, nft_rule_attr_set); +EXPORT_SYMBOL(nftnl_rule_set); void nftnl_rule_set_u32(struct nftnl_rule *r, uint16_t attr, uint32_t val) { nftnl_rule_set_data(r, attr, &val, sizeof(uint32_t)); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_set_u32, nft_rule_attr_set_u32); +EXPORT_SYMBOL(nftnl_rule_set_u32); void nftnl_rule_set_u64(struct nftnl_rule *r, uint16_t attr, uint64_t val) { nftnl_rule_set_data(r, attr, &val, sizeof(uint64_t)); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_set_u64, nft_rule_attr_set_u64); +EXPORT_SYMBOL(nftnl_rule_set_u64); int nftnl_rule_set_str(struct nftnl_rule *r, uint16_t attr, const char *str) { return nftnl_rule_set_data(r, attr, str, strlen(str) + 1); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_set_str, nft_rule_attr_set_str); +EXPORT_SYMBOL(nftnl_rule_set_str); const void *nftnl_rule_get_data(const struct nftnl_rule *r, uint16_t attr, uint32_t *data_len) @@ -236,20 +236,20 @@ const void *nftnl_rule_get_data(const struct nftnl_rule *r, uint16_t attr, } return NULL; } -EXPORT_SYMBOL_ALIAS(nftnl_rule_get_data, nft_rule_attr_get_data); +EXPORT_SYMBOL(nftnl_rule_get_data); const void *nftnl_rule_get(const struct nftnl_rule *r, uint16_t attr) { uint32_t data_len; return nftnl_rule_get_data(r, attr, &data_len); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_get, nft_rule_attr_get); +EXPORT_SYMBOL(nftnl_rule_get); const char *nftnl_rule_get_str(const struct nftnl_rule *r, uint16_t attr) { return nftnl_rule_get(r, attr); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_get_str, nft_rule_attr_get_str); +EXPORT_SYMBOL(nftnl_rule_get_str); uint32_t nftnl_rule_get_u32(const struct nftnl_rule *r, uint16_t attr) { @@ -260,7 +260,7 @@ uint32_t nftnl_rule_get_u32(const struct nftnl_rule *r, uint16_t attr) return val ? *val : 0; } -EXPORT_SYMBOL_ALIAS(nftnl_rule_get_u32, nft_rule_attr_get_u32); +EXPORT_SYMBOL(nftnl_rule_get_u32); uint64_t nftnl_rule_get_u64(const struct nftnl_rule *r, uint16_t attr) { @@ -271,7 +271,7 @@ uint64_t nftnl_rule_get_u64(const struct nftnl_rule *r, uint16_t attr) return val ? *val : 0; } -EXPORT_SYMBOL_ALIAS(nftnl_rule_get_u64, nft_rule_attr_get_u64); +EXPORT_SYMBOL(nftnl_rule_get_u64); uint8_t nftnl_rule_get_u8(const struct nftnl_rule *r, uint16_t attr) { @@ -282,7 +282,7 @@ uint8_t nftnl_rule_get_u8(const struct nftnl_rule *r, uint16_t attr) return val ? *val : 0; } -EXPORT_SYMBOL_ALIAS(nftnl_rule_get_u8, nft_rule_attr_get_u8); +EXPORT_SYMBOL(nftnl_rule_get_u8); void nftnl_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_rule *r) { @@ -323,13 +323,13 @@ void nftnl_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_rule *r) mnl_attr_nest_end(nlh, nest); } } -EXPORT_SYMBOL_ALIAS(nftnl_rule_nlmsg_build_payload, nft_rule_nlmsg_build_payload); +EXPORT_SYMBOL(nftnl_rule_nlmsg_build_payload); void nftnl_rule_add_expr(struct nftnl_rule *r, struct nftnl_expr *expr) { list_add_tail(&expr->head, &r->expr_list); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_add_expr, nft_rule_add_expr); +EXPORT_SYMBOL(nftnl_rule_add_expr); static int nftnl_rule_parse_attr_cb(const struct nlattr *attr, void *data) { @@ -490,7 +490,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r) return 0; } -EXPORT_SYMBOL_ALIAS(nftnl_rule_nlmsg_parse, nft_rule_nlmsg_parse); +EXPORT_SYMBOL(nftnl_rule_nlmsg_parse); #ifdef JSON_PARSING int nftnl_jansson_parse_rule(struct nftnl_rule *r, json_t *tree, @@ -636,14 +636,14 @@ int nftnl_rule_parse(struct nftnl_rule *r, enum nftnl_parse_type type, { return nftnl_rule_do_parse(r, type, data, err, NFTNL_PARSE_BUFFER); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_parse, nft_rule_parse); +EXPORT_SYMBOL(nftnl_rule_parse); int nftnl_rule_parse_file(struct nftnl_rule *r, enum nftnl_parse_type type, FILE *fp, struct nftnl_parse_err *err) { return nftnl_rule_do_parse(r, type, fp, err, NFTNL_PARSE_FILE); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_parse_file, nft_rule_parse_file); +EXPORT_SYMBOL(nftnl_rule_parse_file); static int nftnl_rule_snprintf_json(char *buf, size_t size, const struct nftnl_rule *r, @@ -835,7 +835,7 @@ int nftnl_rule_snprintf(char *buf, size_t size, const struct nftnl_rule *r, return nftnl_rule_cmd_snprintf(buf, size, r, nftnl_flag2cmd(flags), type, flags); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_snprintf, nft_rule_snprintf); +EXPORT_SYMBOL(nftnl_rule_snprintf); static int nftnl_rule_do_snprintf(char *buf, size_t size, const void *r, uint32_t cmd, uint32_t type, uint32_t flags) @@ -849,7 +849,7 @@ int nftnl_rule_fprintf(FILE *fp, const struct nftnl_rule *r, uint32_t type, return nftnl_fprintf(fp, r, NFTNL_CMD_UNSPEC, type, flags, nftnl_rule_do_snprintf); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_fprintf, nft_rule_fprintf); +EXPORT_SYMBOL(nftnl_rule_fprintf); int nftnl_expr_foreach(struct nftnl_rule *r, int (*cb)(struct nftnl_expr *e, void *data), @@ -865,7 +865,7 @@ int nftnl_expr_foreach(struct nftnl_rule *r, } return 0; } -EXPORT_SYMBOL_ALIAS(nftnl_expr_foreach, nft_rule_expr_foreach); +EXPORT_SYMBOL(nftnl_expr_foreach); struct nftnl_expr_iter { const struct nftnl_rule *r; @@ -895,7 +895,7 @@ struct nftnl_expr_iter *nftnl_expr_iter_create(const struct nftnl_rule *r) return iter; } -EXPORT_SYMBOL_ALIAS(nftnl_expr_iter_create, nft_rule_expr_iter_create); +EXPORT_SYMBOL(nftnl_expr_iter_create); struct nftnl_expr *nftnl_expr_iter_next(struct nftnl_expr_iter *iter) { @@ -911,13 +911,13 @@ struct nftnl_expr *nftnl_expr_iter_next(struct nftnl_expr_iter *iter) return expr; } -EXPORT_SYMBOL_ALIAS(nftnl_expr_iter_next, nft_rule_expr_iter_next); +EXPORT_SYMBOL(nftnl_expr_iter_next); void nftnl_expr_iter_destroy(struct nftnl_expr_iter *iter) { xfree(iter); } -EXPORT_SYMBOL_ALIAS(nftnl_expr_iter_destroy, nft_rule_expr_iter_destroy); +EXPORT_SYMBOL(nftnl_expr_iter_destroy); bool nftnl_rule_cmp(const struct nftnl_rule *r1, const struct nftnl_rule *r2) { @@ -966,7 +966,7 @@ struct nftnl_rule_list *nftnl_rule_list_alloc(void) return list; } -EXPORT_SYMBOL_ALIAS(nftnl_rule_list_alloc, nft_rule_list_alloc); +EXPORT_SYMBOL(nftnl_rule_list_alloc); void nftnl_rule_list_free(struct nftnl_rule_list *list) { @@ -978,31 +978,31 @@ void nftnl_rule_list_free(struct nftnl_rule_list *list) } xfree(list); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_list_free, nft_rule_list_free); +EXPORT_SYMBOL(nftnl_rule_list_free); int nftnl_rule_list_is_empty(const struct nftnl_rule_list *list) { return list_empty(&list->list); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_list_is_empty, nft_rule_list_is_empty); +EXPORT_SYMBOL(nftnl_rule_list_is_empty); void nftnl_rule_list_add(struct nftnl_rule *r, struct nftnl_rule_list *list) { list_add(&r->head, &list->list); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_list_add, nft_rule_list_add); +EXPORT_SYMBOL(nftnl_rule_list_add); void nftnl_rule_list_add_tail(struct nftnl_rule *r, struct nftnl_rule_list *list) { list_add_tail(&r->head, &list->list); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_list_add_tail, nft_rule_list_add_tail); +EXPORT_SYMBOL(nftnl_rule_list_add_tail); void nftnl_rule_list_del(struct nftnl_rule *r) { list_del(&r->head); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_list_del, nft_rule_list_del); +EXPORT_SYMBOL(nftnl_rule_list_del); int nftnl_rule_list_foreach(struct nftnl_rule_list *rule_list, int (*cb)(struct nftnl_rule *r, void *data), @@ -1018,7 +1018,7 @@ int nftnl_rule_list_foreach(struct nftnl_rule_list *rule_list, } return 0; } -EXPORT_SYMBOL_ALIAS(nftnl_rule_list_foreach, nft_rule_list_foreach); +EXPORT_SYMBOL(nftnl_rule_list_foreach); struct nftnl_rule_list_iter { const struct nftnl_rule_list *list; @@ -1042,13 +1042,13 @@ nftnl_rule_list_iter_create(const struct nftnl_rule_list *l) return iter; } -EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_create, nft_rule_list_iter_create); +EXPORT_SYMBOL(nftnl_rule_list_iter_create); struct nftnl_rule *nftnl_rule_list_iter_cur(struct nftnl_rule_list_iter *iter) { return iter->cur; } -EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_cur, nft_rule_list_iter_cur); +EXPORT_SYMBOL(nftnl_rule_list_iter_cur); struct nftnl_rule *nftnl_rule_list_iter_next(struct nftnl_rule_list_iter *iter) { @@ -1064,10 +1064,10 @@ struct nftnl_rule *nftnl_rule_list_iter_next(struct nftnl_rule_list_iter *iter) return r; } -EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_next, nft_rule_list_iter_next); +EXPORT_SYMBOL(nftnl_rule_list_iter_next); void nftnl_rule_list_iter_destroy(const struct nftnl_rule_list_iter *iter) { xfree(iter); } -EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_destroy, nft_rule_list_iter_destroy); +EXPORT_SYMBOL(nftnl_rule_list_iter_destroy); -- cgit v1.2.3