From: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: pablo@netfilter.org
Subject: [libnftnl PATCH 2/2] examples: nft-rule-parse-add: give batching support
Date: Tue, 23 Sep 2014 13:15:26 +0200 [thread overview]
Message-ID: <20140923111526.4630.43942.stgit@nfdev.cica.es> (raw)
In-Reply-To: <20140923111521.4630.78017.stgit@nfdev.cica.es>
Let's add support for current kernels.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
examples/nft-rule-parse-add.c | 35 +++++++++++++++++++++++++++++------
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/examples/nft-rule-parse-add.c b/examples/nft-rule-parse-add.c
index 8b6152a..4160435 100644
--- a/examples/nft-rule-parse-add.c
+++ b/examples/nft-rule-parse-add.c
@@ -75,11 +75,12 @@ static struct nft_rule *rule_parse_file(const char *file, uint16_t format)
int main(int argc, char *argv[])
{
struct mnl_socket *nl;
+ struct mnl_nlmsg_batch *batch;
char buf[MNL_SOCKET_BUFFER_SIZE];
struct nlmsghdr *nlh;
- uint32_t portid, seq;
+ uint32_t portid, seq, rule_seq;
struct nft_rule *r;
- int ret;
+ int ret, batching;
uint16_t family, format, outformat;
if (argc < 3) {
@@ -105,14 +106,33 @@ int main(int argc, char *argv[])
nft_rule_fprintf(stdout, r, outformat, 0);
fprintf(stdout, "\n");
- family = nft_rule_attr_get_u32(r, NFT_RULE_ATTR_FAMILY);
+ batching = nft_batch_is_supported();
+ if (batching < 0) {
+ perror("Cannot talk to nfnetlink");
+ exit(EXIT_FAILURE);
+ }
seq = time(NULL);
+ batch = mnl_nlmsg_batch_start(buf, sizeof(buf));
+
+ if (batching) {
+ nft_batch_begin(mnl_nlmsg_batch_current(batch), seq++);
+ mnl_nlmsg_batch_next(batch);
+ }
+
+ rule_seq = seq;
+ family = nft_rule_attr_get_u32(r, NFT_RULE_ATTR_FAMILY);
nlh = nft_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, family,
NLM_F_CREATE|NLM_F_APPEND|NLM_F_ACK,
- seq);
+ seq++);
nft_rule_nlmsg_build_payload(nlh, r);
nft_rule_free(r);
+ mnl_nlmsg_batch_next(batch);
+
+ if (batching) {
+ nft_batch_end(mnl_nlmsg_batch_current(batch), seq++);
+ mnl_nlmsg_batch_next(batch);
+ }
nl = mnl_socket_open(NETLINK_NETFILTER);
if (nl == NULL) {
@@ -126,14 +146,17 @@ int main(int argc, char *argv[])
}
portid = mnl_socket_get_portid(nl);
- if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) {
+ if (mnl_socket_sendto(nl, mnl_nlmsg_batch_head(batch),
+ mnl_nlmsg_batch_size(batch)) < 0) {
perror("mnl_socket_send");
exit(EXIT_FAILURE);
}
+ mnl_nlmsg_batch_stop(batch);
+
ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
while (ret > 0) {
- ret = mnl_cb_run(buf, ret, seq, portid, NULL, NULL);
+ ret = mnl_cb_run(buf, ret, rule_seq, portid, NULL, NULL);
if (ret <= 0)
break;
ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
next prev parent reply other threads:[~2014-09-23 11:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-23 11:15 [libnftnl PATCH 1/2] examples: merge nft-rule-{xml|json}-add.c Arturo Borrero Gonzalez
2014-09-23 11:15 ` Arturo Borrero Gonzalez [this message]
2014-09-23 13:50 ` [libnftnl PATCH 2/2] examples: nft-rule-parse-add: give batching support Pablo Neira Ayuso
2014-09-23 13:50 ` [libnftnl PATCH 1/2] examples: merge nft-rule-{xml|json}-add.c Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140923111526.4630.43942.stgit@nfdev.cica.es \
--to=arturo.borrero.glez@gmail.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).