From 4cb962e4e447dd9ebd13177fca040dd1ff9b8632 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 29 May 2017 19:04:26 +0200 Subject: src: remove global nftnl_batch structure in mnl layer The underlying mnl layer uses a global nftnl_batch structure. Instead, pass pointer as parameter to the functions that need this. The netlink layer stores a reference to this structure in struct netlink_ctx. Signed-off-by: Pablo Neira Ayuso --- include/mnl.h | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) (limited to 'include/mnl.h') diff --git a/include/mnl.h b/include/mnl.h index 69dd0b74..9d2d9410 100644 --- a/include/mnl.h +++ b/include/mnl.h @@ -16,18 +16,19 @@ struct mnl_err { void mnl_err_list_free(struct mnl_err *err); -void mnl_batch_init(void); -bool mnl_batch_ready(void); -void mnl_batch_reset(void); -uint32_t mnl_batch_begin(void); -void mnl_batch_end(void); -int mnl_batch_talk(struct mnl_socket *nl, struct list_head *err_list); -int mnl_nft_rule_batch_add(struct nftnl_rule *nlr, unsigned int flags, - uint32_t seqnum); -int mnl_nft_rule_batch_del(struct nftnl_rule *nlr, unsigned int flags, - uint32_t seqnum); -int mnl_nft_rule_batch_replace(struct nftnl_rule *nlr, unsigned int flags, - uint32_t seqnum); +struct nftnl_batch *mnl_batch_init(void); +bool mnl_batch_ready(struct nftnl_batch *batch); +void mnl_batch_reset(struct nftnl_batch *batch); +uint32_t mnl_batch_begin(struct nftnl_batch *batch); +void mnl_batch_end(struct nftnl_batch *batch); +int mnl_batch_talk(struct mnl_socket *nl, struct nftnl_batch *batch, + struct list_head *err_list); +int mnl_nft_rule_batch_add(struct nftnl_rule *nlr, struct nftnl_batch *batch, + unsigned int flags, uint32_t seqnum); +int mnl_nft_rule_batch_del(struct nftnl_rule *nlr, struct nftnl_batch *batch, + unsigned int flags, uint32_t seqnum); +int mnl_nft_rule_batch_replace(struct nftnl_rule *nlr, struct nftnl_batch *batch, + unsigned int flags, uint32_t seqnum); int mnl_nft_rule_add(struct mnl_socket *nf_sock, struct nftnl_rule *r, unsigned int flags); @@ -38,11 +39,11 @@ struct nftnl_rule_list *mnl_nft_rule_dump(struct mnl_socket *nf_sock, int mnl_nft_chain_add(struct mnl_socket *nf_sock, struct nftnl_chain *nlc, unsigned int flags); -int mnl_nft_chain_batch_add(struct nftnl_chain *nlc, +int mnl_nft_chain_batch_add(struct nftnl_chain *nlc, struct nftnl_batch *batch, unsigned int flags, uint32_t seq); int mnl_nft_chain_delete(struct mnl_socket *nf_sock, struct nftnl_chain *nlc, unsigned int flags); -int mnl_nft_chain_batch_del(struct nftnl_chain *nlc, +int mnl_nft_chain_batch_del(struct nftnl_chain *nlc, struct nftnl_batch *batch, unsigned int flags, uint32_t seq); struct nftnl_chain_list *mnl_nft_chain_dump(struct mnl_socket *nf_sock, int family); @@ -51,11 +52,11 @@ int mnl_nft_chain_get(struct mnl_socket *nf_sock, struct nftnl_chain *nlc, int mnl_nft_table_add(struct mnl_socket *nf_sock, struct nftnl_table *nlt, unsigned int flags); -int mnl_nft_table_batch_add(struct nftnl_table *nlt, +int mnl_nft_table_batch_add(struct nftnl_table *nlt, struct nftnl_batch *batch, unsigned int flags, uint32_t seq); int mnl_nft_table_delete(struct mnl_socket *nf_sock, struct nftnl_table *nlt, unsigned int flags); -int mnl_nft_table_batch_del(struct nftnl_table *nlt, +int mnl_nft_table_batch_del(struct nftnl_table *nlt, struct nftnl_batch *batch, unsigned int flags, uint32_t seq); struct nftnl_table_list *mnl_nft_table_dump(struct mnl_socket *nf_sock, int family); @@ -64,11 +65,11 @@ int mnl_nft_table_get(struct mnl_socket *nf_sock, struct nftnl_table *nlt, int mnl_nft_set_add(struct mnl_socket *nf_sock, struct nftnl_set *nls, unsigned int flags); -int mnl_nft_set_batch_add(struct nftnl_set *nls, +int mnl_nft_set_batch_add(struct nftnl_set *nls, struct nftnl_batch *batch, unsigned int flags, uint32_t seq); int mnl_nft_set_delete(struct mnl_socket *nf_sock, struct nftnl_set *nls, unsigned int flags); -int mnl_nft_set_batch_del(struct nftnl_set *nls, +int mnl_nft_set_batch_del(struct nftnl_set *nls, struct nftnl_batch *batch, unsigned int flags, uint32_t seq); struct nftnl_set_list *mnl_nft_set_dump(struct mnl_socket *nf_sock, int family, const char *table); @@ -76,23 +77,23 @@ int mnl_nft_set_get(struct mnl_socket *nf_sock, struct nftnl_set *nls); int mnl_nft_setelem_add(struct mnl_socket *nf_sock, struct nftnl_set *nls, unsigned int flags); -int mnl_nft_setelem_batch_add(struct nftnl_set *nls, +int mnl_nft_setelem_batch_add(struct nftnl_set *nls, struct nftnl_batch *batch, unsigned int flags, uint32_t seq); int mnl_nft_setelem_delete(struct mnl_socket *nf_sock, struct nftnl_set *nls, unsigned int flags); -int mnl_nft_setelem_batch_del(struct nftnl_set *nls, +int mnl_nft_setelem_batch_del(struct nftnl_set *nls, struct nftnl_batch *batch, unsigned int flags, uint32_t seq); -int mnl_nft_setelem_batch_flush(struct nftnl_set *nls, unsigned int flags, - uint32_t seqnum); +int mnl_nft_setelem_batch_flush(struct nftnl_set *nls, struct nftnl_batch *batch, + unsigned int flags, uint32_t seqnum); int mnl_nft_setelem_get(struct mnl_socket *nf_sock, struct nftnl_set *nls); struct nftnl_obj_list *mnl_nft_obj_dump(struct mnl_socket *nf_sock, int family, const char *table, const char *name, uint32_t type, bool dump, bool reset); -int mnl_nft_obj_batch_add(struct nftnl_obj *nln, unsigned int flags, - uint32_t seqnum); -int mnl_nft_obj_batch_del(struct nftnl_obj *nln, unsigned int flags, - uint32_t seqnum); +int mnl_nft_obj_batch_add(struct nftnl_obj *nln, struct nftnl_batch *batch, + unsigned int flags, uint32_t seqnum); +int mnl_nft_obj_batch_del(struct nftnl_obj *nln, struct nftnl_batch *batch, + unsigned int flags, uint32_t seqnum); struct nftnl_ruleset *mnl_nft_ruleset_dump(struct mnl_socket *nf_sock, uint32_t family); -- cgit v1.2.3