From 742baabd185c326cc2125e648e240894362eb31c Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 15 Sep 2015 16:37:32 +0200 Subject: iptables-compat: use new symbols in libnftnl Adapt this code to use the new symbols in libnftnl. This patch contains quite some renaming to reserve the nft_ prefix for our high level library. Explicitly request libnftnl 1.0.5 at configure stage. Signed-off-by: Pablo Neira Ayuso --- iptables/nft-ipv6.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'iptables/nft-ipv6.c') diff --git a/iptables/nft-ipv6.c b/iptables/nft-ipv6.c index d50b138e..7b27d872 100644 --- a/iptables/nft-ipv6.c +++ b/iptables/nft-ipv6.c @@ -24,7 +24,7 @@ #include "nft.h" #include "nft-shared.h" -static int nft_ipv6_add(struct nft_rule *r, void *data) +static int nft_ipv6_add(struct nftnl_rule *r, void *data) { struct iptables_command_state *cs = data; struct xtables_rule_match *matchp; @@ -99,7 +99,7 @@ static bool nft_ipv6_is_same(const void *data_a, b->fw6.ipv6.outiface_mask); } -static void nft_ipv6_parse_meta(struct nft_xt_ctx *ctx, struct nft_rule_expr *e, +static void nft_ipv6_parse_meta(struct nft_xt_ctx *ctx, struct nftnl_expr *e, void *data) { struct iptables_command_state *cs = data; @@ -115,7 +115,7 @@ static void parse_mask_ipv6(struct nft_xt_ctx *ctx, struct in6_addr *mask) } static void nft_ipv6_parse_payload(struct nft_xt_ctx *ctx, - struct nft_rule_expr *e, void *data) + struct nftnl_expr *e, void *data) { struct iptables_command_state *cs = data; struct in6_addr addr; @@ -217,7 +217,7 @@ static void print_ipv6_addr(const struct iptables_command_state *cs, } } -static void nft_ipv6_print_firewall(struct nft_rule *r, unsigned int num, +static void nft_ipv6_print_firewall(struct nftnl_rule *r, unsigned int num, unsigned int format) { struct iptables_command_state cs = {}; @@ -362,7 +362,7 @@ static void nft_ipv6_parse_target(struct xtables_target *t, void *data) } static bool nft_ipv6_rule_find(struct nft_family_ops *ops, - struct nft_rule *r, void *data) + struct nftnl_rule *r, void *data) { struct iptables_command_state *cs = data; -- cgit v1.2.3