netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: pablo@netfilter.org
Subject: [libnftnl PATCH 5/6] examples: nft-table-del: add table_del_parse()
Date: Fri, 22 Aug 2014 11:39:51 +0200	[thread overview]
Message-ID: <20140822093951.1524.4682.stgit@nfdev.cica.es> (raw)
In-Reply-To: <20140822093929.1524.32948.stgit@nfdev.cica.es>

This new function parses the input arguments and generates the nft_table.

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
 examples/nft-table-del.c |   55 +++++++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 20 deletions(-)

diff --git a/examples/nft-table-del.c b/examples/nft-table-del.c
index ed1140d..ae7db27 100644
--- a/examples/nft-table-del.c
+++ b/examples/nft-table-del.c
@@ -20,13 +20,43 @@
 #include <libmnl/libmnl.h>
 #include <libnftnl/table.h>
 
+static struct nft_table *table_del_parse(int argc, char *argv[])
+{
+	struct nft_table *t;
+	uint16_t family;
+
+	if (strcmp(argv[1], "ip") == 0)
+		family = NFPROTO_IPV4;
+	else if (strcmp(argv[1], "ip6") == 0)
+		family = NFPROTO_IPV6;
+	else if (strcmp(argv[1], "bridge") == 0)
+		family = NFPROTO_BRIDGE;
+	else if (strcmp(argv[1], "arp") == 0)
+		family = NFPROTO_ARP;
+	else {
+		fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n");
+		return NULL;
+	}
+
+	t = nft_table_alloc();
+	if (t == NULL) {
+		perror("OOM");
+		return NULL;
+	}
+
+	nft_table_attr_set_str(t, NFT_TABLE_ATTR_NAME, argv[2]);
+	nft_table_attr_set_u32(t, NFT_TABLE_ATTR_FAMILY, family);
+
+	return t;
+}
+
 int main(int argc, char *argv[])
 {
 	struct mnl_socket *nl;
 	char buf[MNL_SOCKET_BUFFER_SIZE];
 	struct nlmsghdr *nlh;
 	uint32_t portid, seq, family;
-	struct nft_table *t = NULL;
+	struct nft_table *t;
 	int ret;
 
 	if (argc != 3) {
@@ -34,30 +64,15 @@ int main(int argc, char *argv[])
 		exit(EXIT_FAILURE);
 	}
 
-	t = nft_table_alloc();
-	if (t == NULL) {
-		perror("OOM");
+	t = table_del_parse(argc, argv);
+	if (t == NULL)
 		exit(EXIT_FAILURE);
-	}
 
-	seq = time(NULL);
-	if (strcmp(argv[1], "ip") == 0)
-		family = NFPROTO_IPV4;
-	else if (strcmp(argv[1], "ip6") == 0)
-		family = NFPROTO_IPV6;
-	else if (strcmp(argv[1], "bridge") == 0)
-		family = NFPROTO_BRIDGE;
-	else if (strcmp(argv[1], "arp") == 0)
-		family = NFPROTO_ARP;
-	else {
-		fprintf(stderr, "Unknown family: ip, ip6, bridge, arp\n");
-		exit(EXIT_FAILURE);
-	}
 
+	seq = time(NULL);
+	family = nft_table_attr_get_u32(t, NFT_TABLE_ATTR_FAMILY);
 	nlh = nft_table_nlmsg_build_hdr(buf, NFT_MSG_DELTABLE, family,
 					NLM_F_ACK, seq);
-	nft_table_attr_set(t, NFT_TABLE_ATTR_NAME, argv[2]);
-
 	nft_table_nlmsg_build_payload(nlh, t);
 	nft_table_free(t);
 


  parent reply	other threads:[~2014-08-22  9:39 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-22  9:39 [libnftnl PATCH 1/6] examples: merge nft-table-{xml|json}-add.c Arturo Borrero Gonzalez
2014-08-22  9:39 ` [libnftnl PATCH 2/6] examples: nft-table-parse-add: add batching support Arturo Borrero Gonzalez
2014-08-22  9:39 ` [libnftnl PATCH 3/6] examples: nft-table-add: add table_add_parse() Arturo Borrero Gonzalez
2014-08-22  9:39 ` [libnftnl PATCH 4/6] examples: nft-table-add: add batching support Arturo Borrero Gonzalez
2014-08-22  9:39 ` Arturo Borrero Gonzalez [this message]
2014-08-22  9:39 ` [libnftnl PATCH 6/6] examples: nft-table-del: " Arturo Borrero Gonzalez
2014-08-24 13:01 ` [libnftnl PATCH 1/6] examples: merge nft-table-{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=20140822093951.1524.4682.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).