summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2017-08-22 18:38:45 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2017-08-23 23:42:33 +0200
commite1946ec7f11e2c6daa11b141eb344ef44642056f (patch)
tree2b02cf30c4843a91990dcf29ea53b2c515041018
parent201893986f051d1d362669df9176c69f820673e7 (diff)
mnl: pass struct netlink_ctx to mnl_nft_socket_sendmsg()
Reduce function footprint. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--src/mnl.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mnl.c b/src/mnl.c
index 4f9c30c2..e51c3294 100644
--- a/src/mnl.c
+++ b/src/mnl.c
@@ -210,13 +210,12 @@ static void mnl_set_sndbuffer(const struct mnl_socket *nl,
nlbuffsiz = newbuffsiz;
}
-static ssize_t mnl_nft_socket_sendmsg(const struct mnl_socket *nl,
- struct nftnl_batch *batch)
+static ssize_t mnl_nft_socket_sendmsg(const struct netlink_ctx *ctx)
{
static const struct sockaddr_nl snl = {
.nl_family = AF_NETLINK
};
- uint32_t iov_len = nftnl_batch_iovec_len(batch);
+ uint32_t iov_len = nftnl_batch_iovec_len(ctx->batch);
struct iovec iov[iov_len];
struct msghdr msg = {
.msg_name = (struct sockaddr *) &snl,
@@ -226,8 +225,8 @@ static ssize_t mnl_nft_socket_sendmsg(const struct mnl_socket *nl,
};
uint32_t i;
- mnl_set_sndbuffer(nl, batch);
- nftnl_batch_iovec(batch, iov, iov_len);
+ mnl_set_sndbuffer(ctx->nf_sock, ctx->batch);
+ nftnl_batch_iovec(ctx->batch, iov, iov_len);
for (i = 0; i < iov_len; i++) {
if (debug_level & DEBUG_MNL) {
@@ -237,7 +236,7 @@ static ssize_t mnl_nft_socket_sendmsg(const struct mnl_socket *nl,
}
}
- return sendmsg(mnl_socket_get_fd(nl), &msg, 0);
+ return sendmsg(mnl_socket_get_fd(ctx->nf_sock), &msg, 0);
}
int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list)
@@ -251,7 +250,7 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list)
.tv_usec = 0
};
- ret = mnl_nft_socket_sendmsg(nl, ctx->batch);
+ ret = mnl_nft_socket_sendmsg(ctx);
if (ret == -1)
return -1;