diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-22 21:18:19 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-22 21:45:37 +0200 |
commit | 2dc07bcd7eaa56369dff01b596acf010308007d3 (patch) | |
tree | aee032b5f320cd8c58fd3641e994431705310b81 /include | |
parent | 00f777bfc414af1e1384a213adc91ae4ecf6cbdf (diff) |
src: pass struct nft_ctx through struct netlink_ctx
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/netlink.h | 9 | ||||
-rw-r--r-- | include/rule.h | 10 |
2 files changed, 6 insertions, 13 deletions
diff --git a/include/netlink.h b/include/netlink.h index b7e2232f..b26ef459 100644 --- a/include/netlink.h +++ b/include/netlink.h @@ -35,26 +35,21 @@ extern const struct location netlink_location; /** * struct netlink_ctx * + * @nft: nftables context * @msgs: message queue * @list: list of parsed rules/chains/tables * @set: current set * @data: pointer to pass data to callback * @seqnum: sequence number - * @octx: output context - * @debug_mask: display debugging information - * @cache: cache context */ struct netlink_ctx { - struct mnl_socket *nf_sock; + struct nft_ctx *nft; struct list_head *msgs; struct list_head list; struct set *set; const void *data; uint32_t seqnum; struct nftnl_batch *batch; - unsigned int debug_mask; - struct output_ctx *octx; - struct nft_cache *cache; }; extern struct nftnl_expr *alloc_nft_expr(const char *name); diff --git a/include/rule.h b/include/rule.h index c6c5ca98..977f2748 100644 --- a/include/rule.h +++ b/include/rule.h @@ -618,12 +618,10 @@ extern struct error_record *rule_postprocess(struct rule *rule); struct netlink_ctx; extern int do_command(struct netlink_ctx *ctx, struct cmd *cmd); -extern int cache_update(struct mnl_socket *nf_sock, struct nft_cache *cache, - enum cmd_ops cmd, struct list_head *msgs, unsigned int debug_flag, - struct output_ctx *octx); -extern void cache_flush(struct mnl_socket *nf_sock, struct nft_cache *cache, - enum cmd_ops cmd, struct list_head *msgs, - unsigned int debug_mask, struct output_ctx *octx); +extern int cache_update(struct nft_ctx *ctx, enum cmd_ops cmd, + struct list_head *msgs); +extern void cache_flush(struct nft_ctx *ctx, enum cmd_ops cmd, + struct list_head *msgs); extern void cache_release(struct nft_cache *cache); enum udata_type { |