summaryrefslogtreecommitdiffstats
path: root/src/rule.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2015-09-15 13:20:34 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2015-09-16 15:14:33 +0200
commitd6f06c3069990759a95a28c5dfcb76e9c6eebae0 (patch)
treed685c0921304b259518e3e1214cad8c95d4603db /src/rule.c
parentb716c2b48a77fd0c01be128d704d9cd2cd5243b3 (diff)
src: use new symbols in libnftnl
Adapt the nftables 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 <pablo@netfilter.org>
Diffstat (limited to 'src/rule.c')
-rw-r--r--src/rule.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rule.c b/src/rule.c
index f3a5a990..43cc4a8a 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -955,7 +955,7 @@ static int do_command_delete(struct netlink_ctx *ctx, struct cmd *cmd)
static int do_command_export(struct netlink_ctx *ctx, struct cmd *cmd)
{
- struct nft_ruleset *rs;
+ struct nftnl_ruleset *rs;
do {
rs = netlink_dump_ruleset(ctx, &cmd->handle, &cmd->location);
@@ -963,10 +963,10 @@ static int do_command_export(struct netlink_ctx *ctx, struct cmd *cmd)
return -1;
} while (rs == NULL);
- nft_ruleset_fprintf(stdout, rs, cmd->export->format, 0);
+ nftnl_ruleset_fprintf(stdout, rs, cmd->export->format, 0);
fprintf(stdout, "\n");
- nft_ruleset_free(rs);
+ nftnl_ruleset_free(rs);
return 0;
}
@@ -1104,7 +1104,7 @@ static int do_command_monitor(struct netlink_ctx *ctx, struct cmd *cmd)
* - new elements
*/
if (((cmd->monitor->flags & (1 << NFT_MSG_NEWRULE)) &&
- (cmd->monitor->format == NFT_OUTPUT_DEFAULT)) ||
+ (cmd->monitor->format == NFTNL_OUTPUT_DEFAULT)) ||
(cmd->monitor->flags & (1 << NFT_MSG_NEWSETELEM)))
monhandler.cache_needed = true;
else