diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-24 19:18:50 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-24 19:26:34 +0200 |
commit | 6dc1c3d8bb64077da7f3f28c7368fb087d10a492 (patch) | |
tree | 880fe8bacaaf4b72035a9c430f86e6e5a15ba9bf /include | |
parent | dc240913458d591f59b52b3899d3fc3c5d6ec6ce (diff) |
src: remove nftnl_rule_cmp() and nftnl_expr_cmp()
These functions are not very useful, rule comparison from this layer
does not work well with implicit set definitions.
This infrastructure was added as an attempt to support for deletion by
name from this layer, which should be done from higher level libnftables
library. Finally, we never had a client for this code in
git.netfilter.org.
Let's remove it and bump libversion for safety reasons.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/data_reg.h | 2 | ||||
-rw-r--r-- | include/expr_ops.h | 1 | ||||
-rw-r--r-- | include/libnftnl/expr.h | 2 | ||||
-rw-r--r-- | include/libnftnl/rule.h | 2 |
4 files changed, 0 insertions, 7 deletions
diff --git a/include/data_reg.h b/include/data_reg.h index 3fec7cd..f2675f2 100644 --- a/include/data_reg.h +++ b/include/data_reg.h @@ -28,8 +28,6 @@ int nftnl_data_reg_snprintf(char *buf, size_t size, const union nftnl_data_reg *reg, uint32_t output_format, uint32_t flags, int reg_type); -bool nftnl_data_reg_cmp(const union nftnl_data_reg *r1, - const union nftnl_data_reg *r2, int reg_type); struct nlattr; int nftnl_parse_data(union nftnl_data_reg *data, struct nlattr *attr, int *type); diff --git a/include/expr_ops.h b/include/expr_ops.h index 00548b3..a7f1b9a 100644 --- a/include/expr_ops.h +++ b/include/expr_ops.h @@ -13,7 +13,6 @@ struct expr_ops { uint32_t alloc_len; int max_attr; void (*free)(const struct nftnl_expr *e); - bool (*cmp)(const struct nftnl_expr *e1, const struct nftnl_expr *e2); int (*set)(struct nftnl_expr *e, uint16_t type, const void *data, uint32_t data_len); const void *(*get)(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len); int (*parse)(struct nftnl_expr *e, struct nlattr *attr); diff --git a/include/libnftnl/expr.h b/include/libnftnl/expr.h index 6988c62..cb1b54b 100644 --- a/include/libnftnl/expr.h +++ b/include/libnftnl/expr.h @@ -36,8 +36,6 @@ uint32_t nftnl_expr_get_u32(const struct nftnl_expr *expr, uint16_t type); uint64_t nftnl_expr_get_u64(const struct nftnl_expr *expr, uint16_t type); const char *nftnl_expr_get_str(const struct nftnl_expr *expr, uint16_t type); -bool nftnl_expr_cmp(const struct nftnl_expr *e1, const struct nftnl_expr *e2); - int nftnl_expr_snprintf(char *buf, size_t buflen, const struct nftnl_expr *expr, uint32_t type, uint32_t flags); int nftnl_expr_fprintf(FILE *fp, const struct nftnl_expr *expr, uint32_t type, uint32_t flags); diff --git a/include/libnftnl/rule.h b/include/libnftnl/rule.h index 765d2ce..8501c86 100644 --- a/include/libnftnl/rule.h +++ b/include/libnftnl/rule.h @@ -51,8 +51,6 @@ uint64_t nftnl_rule_get_u64(const struct nftnl_rule *r, uint16_t attr); void nftnl_rule_add_expr(struct nftnl_rule *r, struct nftnl_expr *expr); -bool nftnl_rule_cmp(const struct nftnl_rule *r1, const struct nftnl_rule *r2); - struct nlmsghdr; void nftnl_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_rule *t); |