diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/mnl.h | 58 | ||||
| -rw-r--r-- | include/netlink.h | 26 |
2 files changed, 42 insertions, 42 deletions
diff --git a/include/mnl.h b/include/mnl.h index a0dfa1b4..9c14e1aa 100644 --- a/include/mnl.h +++ b/include/mnl.h @@ -22,67 +22,67 @@ 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 nft_rule *nlr, unsigned int flags, +int mnl_nft_rule_batch_add(struct nftnl_rule *nlr, unsigned int flags, uint32_t seqnum); -int mnl_nft_rule_batch_del(struct nft_rule *nlr, unsigned int flags, +int mnl_nft_rule_batch_del(struct nftnl_rule *nlr, unsigned int flags, uint32_t seqnum); -int mnl_nft_rule_add(struct mnl_socket *nf_sock, struct nft_rule *r, +int mnl_nft_rule_add(struct mnl_socket *nf_sock, struct nftnl_rule *r, unsigned int flags); -int mnl_nft_rule_delete(struct mnl_socket *nf_sock, struct nft_rule *r, +int mnl_nft_rule_delete(struct mnl_socket *nf_sock, struct nftnl_rule *r, unsigned int flags); -struct nft_rule_list *mnl_nft_rule_dump(struct mnl_socket *nf_sock, +struct nftnl_rule_list *mnl_nft_rule_dump(struct mnl_socket *nf_sock, int family); -int mnl_nft_chain_add(struct mnl_socket *nf_sock, struct nft_chain *nlc, +int mnl_nft_chain_add(struct mnl_socket *nf_sock, struct nftnl_chain *nlc, unsigned int flags); -int mnl_nft_chain_batch_add(struct nft_chain *nlc, +int mnl_nft_chain_batch_add(struct nftnl_chain *nlc, unsigned int flags, uint32_t seq); -int mnl_nft_chain_delete(struct mnl_socket *nf_sock, struct nft_chain *nlc, +int mnl_nft_chain_delete(struct mnl_socket *nf_sock, struct nftnl_chain *nlc, unsigned int flags); -int mnl_nft_chain_batch_del(struct nft_chain *nlc, +int mnl_nft_chain_batch_del(struct nftnl_chain *nlc, unsigned int flags, uint32_t seq); -struct nft_chain_list *mnl_nft_chain_dump(struct mnl_socket *nf_sock, +struct nftnl_chain_list *mnl_nft_chain_dump(struct mnl_socket *nf_sock, int family); -int mnl_nft_chain_get(struct mnl_socket *nf_sock, struct nft_chain *nlc, +int mnl_nft_chain_get(struct mnl_socket *nf_sock, struct nftnl_chain *nlc, unsigned int flags); -int mnl_nft_table_add(struct mnl_socket *nf_sock, struct nft_table *nlt, +int mnl_nft_table_add(struct mnl_socket *nf_sock, struct nftnl_table *nlt, unsigned int flags); -int mnl_nft_table_batch_add(struct nft_table *nlt, +int mnl_nft_table_batch_add(struct nftnl_table *nlt, unsigned int flags, uint32_t seq); -int mnl_nft_table_delete(struct mnl_socket *nf_sock, struct nft_table *nlt, +int mnl_nft_table_delete(struct mnl_socket *nf_sock, struct nftnl_table *nlt, unsigned int flags); -int mnl_nft_table_batch_del(struct nft_table *nlt, +int mnl_nft_table_batch_del(struct nftnl_table *nlt, unsigned int flags, uint32_t seq); -struct nft_table_list *mnl_nft_table_dump(struct mnl_socket *nf_sock, +struct nftnl_table_list *mnl_nft_table_dump(struct mnl_socket *nf_sock, int family); -int mnl_nft_table_get(struct mnl_socket *nf_sock, struct nft_table *nlt, +int mnl_nft_table_get(struct mnl_socket *nf_sock, struct nftnl_table *nlt, unsigned int flags); -int mnl_nft_set_add(struct mnl_socket *nf_sock, struct nft_set *nls, +int mnl_nft_set_add(struct mnl_socket *nf_sock, struct nftnl_set *nls, unsigned int flags); -int mnl_nft_set_batch_add(struct nft_set *nls, +int mnl_nft_set_batch_add(struct nftnl_set *nls, unsigned int flags, uint32_t seq); -int mnl_nft_set_delete(struct mnl_socket *nf_sock, struct nft_set *nls, +int mnl_nft_set_delete(struct mnl_socket *nf_sock, struct nftnl_set *nls, unsigned int flags); -int mnl_nft_set_batch_del(struct nft_set *nls, +int mnl_nft_set_batch_del(struct nftnl_set *nls, unsigned int flags, uint32_t seq); -struct nft_set_list *mnl_nft_set_dump(struct mnl_socket *nf_sock, int family, +struct nftnl_set_list *mnl_nft_set_dump(struct mnl_socket *nf_sock, int family, const char *table); -int mnl_nft_set_get(struct mnl_socket *nf_sock, struct nft_set *nls); +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 nft_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 nft_set *nls, +int mnl_nft_setelem_batch_add(struct nftnl_set *nls, unsigned int flags, uint32_t seq); -int mnl_nft_setelem_delete(struct mnl_socket *nf_sock, struct nft_set *nls, +int mnl_nft_setelem_delete(struct mnl_socket *nf_sock, struct nftnl_set *nls, unsigned int flags); -int mnl_nft_setelem_batch_del(struct nft_set *nls, +int mnl_nft_setelem_batch_del(struct nftnl_set *nls, unsigned int flags, uint32_t seq); -int mnl_nft_setelem_get(struct mnl_socket *nf_sock, struct nft_set *nls); +int mnl_nft_setelem_get(struct mnl_socket *nf_sock, struct nftnl_set *nls); -struct nft_ruleset *mnl_nft_ruleset_dump(struct mnl_socket *nf_sock, +struct nftnl_ruleset *mnl_nft_ruleset_dump(struct mnl_socket *nf_sock, uint32_t family); int mnl_nft_event_listener(struct mnl_socket *nf_sock, int (*cb)(const struct nlmsghdr *nlh, void *data), diff --git a/include/netlink.h b/include/netlink.h index 185c4357..7bf7ea0d 100644 --- a/include/netlink.h +++ b/include/netlink.h @@ -33,11 +33,11 @@ struct netlink_ctx { bool batch_supported; }; -extern struct nft_table *alloc_nft_table(const struct handle *h); -extern struct nft_chain *alloc_nft_chain(const struct handle *h); -extern struct nft_rule *alloc_nft_rule(const struct handle *h); -extern struct nft_rule_expr *alloc_nft_expr(const char *name); -extern struct nft_set *alloc_nft_set(const struct handle *h); +extern struct nftnl_table *alloc_nftnl_table(const struct handle *h); +extern struct nftnl_chain *alloc_nftnl_chain(const struct handle *h); +extern struct nftnl_rule *alloc_nftnl_rule(const struct handle *h); +extern struct nftnl_expr *alloc_nft_expr(const char *name); +extern struct nftnl_set *alloc_nftnl_set(const struct handle *h); struct nft_data_linearize { uint32_t len; @@ -81,10 +81,10 @@ extern struct expr *netlink_alloc_data(const struct location *loc, enum nft_registers dreg); extern void netlink_linearize_rule(struct netlink_ctx *ctx, - struct nft_rule *nlr, + struct nftnl_rule *nlr, const struct rule *rule); extern struct rule *netlink_delinearize_rule(struct netlink_ctx *ctx, - const struct nft_rule *r); + const struct nftnl_rule *r); extern int netlink_add_rule(struct netlink_ctx *ctx, const struct handle *h, const struct rule *rule, uint32_t flags); @@ -145,11 +145,11 @@ extern int netlink_delete_setelems(struct netlink_ctx *ctx, const struct handle extern int netlink_get_setelems(struct netlink_ctx *ctx, const struct handle *h, const struct location *loc, struct set *set); -extern void netlink_dump_table(struct nft_table *nlt); -extern void netlink_dump_chain(struct nft_chain *nlc); -extern void netlink_dump_rule(struct nft_rule *nlr); -extern void netlink_dump_expr(struct nft_rule_expr *nle); -extern void netlink_dump_set(struct nft_set *nls); +extern void netlink_dump_table(struct nftnl_table *nlt); +extern void netlink_dump_chain(struct nftnl_chain *nlc); +extern void netlink_dump_rule(struct nftnl_rule *nlr); +extern void netlink_dump_expr(struct nftnl_expr *nle); +extern void netlink_dump_set(struct nftnl_set *nls); extern int netlink_batch_send(struct list_head *err_list); @@ -168,7 +168,7 @@ extern int netlink_flush_ruleset(struct netlink_ctx *ctx, const struct handle *h, const struct location *loc); -extern struct nft_ruleset *netlink_dump_ruleset(struct netlink_ctx *ctx, +extern struct nftnl_ruleset *netlink_dump_ruleset(struct netlink_ctx *ctx, const struct handle *h, const struct location *loc); struct netlink_mon_handler { |