From 15ab98728c3cb1a35273abbf63936c0dce7fd557 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 24 Oct 2018 18:37:48 +0200 Subject: mnl: remove alloc_nftnl_flowtable() We can remove alloc_nftnl_flowtable() and consolidate infrastructure in the src/mnl.c file. Signed-off-by: Pablo Neira Ayuso --- include/mnl.h | 9 +++------ include/netlink.h | 5 +---- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/mnl.h b/include/mnl.h index 457dd2ed..1784b3aa 100644 --- a/include/mnl.h +++ b/include/mnl.h @@ -77,12 +77,9 @@ int mnl_nft_obj_del(struct netlink_ctx *ctx, const struct cmd *cmd, int type); struct nftnl_flowtable_list * mnl_nft_flowtable_dump(struct netlink_ctx *ctx, int family, const char *table); -int mnl_nft_flowtable_batch_add(struct nftnl_flowtable *flo, - struct nftnl_batch *batch, unsigned int flags, - uint32_t seqnum); -int mnl_nft_flowtable_batch_del(struct nftnl_flowtable *flow, - struct nftnl_batch *batch, unsigned int flags, - uint32_t seqnum); +int mnl_nft_flowtable_add(struct netlink_ctx *ctx, const struct cmd *cmd, + unsigned int flags); +int mnl_nft_flowtable_del(struct netlink_ctx *ctx, const struct cmd *cmd); struct nftnl_ruleset *mnl_nft_ruleset_dump(struct netlink_ctx *ctx, uint32_t family); diff --git a/include/netlink.h b/include/netlink.h index b82ca727..8bdf192b 100644 --- a/include/netlink.h +++ b/include/netlink.h @@ -136,10 +136,6 @@ extern struct obj *netlink_delinearize_obj(struct netlink_ctx *ctx, extern int netlink_list_flowtables(struct netlink_ctx *ctx, const struct handle *h); -extern int netlink_add_flowtable(struct netlink_ctx *ctx, - const struct cmd *cmd, uint32_t flags); -extern int netlink_delete_flowtable(struct netlink_ctx *ctx, - const struct cmd *cmd); extern void netlink_dump_chain(const struct nftnl_chain *nlc, struct netlink_ctx *ctx); @@ -150,6 +146,7 @@ extern void netlink_dump_expr(const struct nftnl_expr *nle, extern void netlink_dump_set(const struct nftnl_set *nls, struct netlink_ctx *ctx); extern void netlink_dump_obj(struct nftnl_obj *nlo, struct netlink_ctx *ctx); +extern void netlink_dump_flowtable(struct nftnl_flowtable *flo, struct netlink_ctx *ctx); extern int netlink_batch_send(struct netlink_ctx *ctx, struct list_head *err_list); -- cgit v1.2.3