src: add export operation

include/netlink.h +3 -0

 #include <libnftnl/table.h>
 #include <libnftnl/chain.h>
 #include <libnftnl/rule.h>

@@ -136,4 +138,7 @@ extern int netlink_batch_send(struct list_head *err_list);
 extern int netlink_io_error(struct netlink_ctx *ctx,
 			    const struct location *loc, const char *fmt, ...);
 
+extern struct nft_ruleset *netlink_dump_ruleset(struct netlink_ctx *ctx,
+						const struct handle *h,
+						const struct location *loc);
 #endif /* NFTABLES_NETLINK_H */

include/rule.h +1 -0

@@ -247,6 +249,7 @@ enum cmd_obj {
  * @seqnum:	sequence number to match netlink errors
  * @union:	object
  * @arg:	argument data
+ * @format:	info about the output format (enum nft_output_type)
  */
 struct cmd {
 	struct list_head	list;

index b867902..11487e7 100644

src/mnl.c +46 -1

@@ -9,6 +9,8 @@
  */
 
 #include <libmnl/libmnl.h>
+#include <libnftnl/common.h>
+#include <libnftnl/ruleset.h>
 #include <libnftnl/table.h>
 #include <libnftnl/chain.h>
 #include <libnftnl/rule.h>

@@ -645,7 +647,8 @@ mnl_nft_set_dump(struct mnl_socket *nf_sock, int family, const char *table)
 
 	nlh = nft_set_nlmsg_build_hdr(buf, NFT_MSG_GETSET, family,
 				      NLM_F_DUMP|NLM_F_ACK, seq);
-	nft_set_attr_set(s, NFT_SET_ATTR_TABLE, table);
+	if (table != NULL)
+		nft_set_attr_set(s, NFT_SET_ATTR_TABLE, table);
 	nft_set_nlmsg_build_payload(nlh, s);
 	nft_set_free(s);
 

@@ -733,3 +736,62 @@ int mnl_nft_setelem_get(struct mnl_socket *nf_sock, struct nft_set *nls)
 
 	return mnl_talk(nf_sock, nlh, nlh->nlmsg_len, set_elem_cb, nls);
 }
+
+/*
+ * ruleset
+ */
+struct nft_ruleset *mnl_nft_ruleset_dump(struct mnl_socket *nf_sock,
+					 uint32_t family)
+{
+	struct nft_ruleset *rs;
+	struct nft_table_list *t;
+	struct nft_chain_list *c;
+	struct nft_set_list *sl;
+	struct nft_set_list_iter *i;
+	struct nft_set *s;
+	struct nft_rule_list *r;
+	int ret = 0;
+
+	rs = nft_ruleset_alloc();
+	if (rs == NULL)
+		memory_allocation_error();
+
+	t = mnl_nft_table_dump(nf_sock, family);
+	if (t != NULL)
+		nft_ruleset_attr_set(rs, NFT_RULESET_ATTR_TABLELIST, t);
+
+	c = mnl_nft_chain_dump(nf_sock, family);
+	if (c != NULL)
+		nft_ruleset_attr_set(rs, NFT_RULESET_ATTR_CHAINLIST, c);
+
+	sl = mnl_nft_set_dump(nf_sock, family, NULL);
+	if (sl != NULL) {
+		i = nft_set_list_iter_create(sl);
+		s = nft_set_list_iter_next(i);
+		while (s != NULL) {
+			ret = mnl_nft_setelem_get(nf_sock, s);
+			if (ret != 0)
+				goto out;
+
+			s = nft_set_list_iter_next(i);
+		}
+		nft_set_list_iter_destroy(i);
+
+		nft_ruleset_attr_set(rs, NFT_RULESET_ATTR_SETLIST, sl);

src/mnl.c +7 -0

+		goto out;
+
+	return rs;
+out:
+	nft_ruleset_free(rs);
+	return NULL;
+}

src/netlink.c +0 -0

index 7f69995..d6de8d9 100644

src/netlink.c +14 -0

 #include <nftables.h>
 #include <netlink.h>
 #include <mnl.h>

@@ -1048,3 +1048,17 @@ int netlink_batch_send(struct list_head *err_list)
 {
 	return mnl_batch_talk(nf_sock, err_list);
 }
+
+struct nft_ruleset *netlink_dump_ruleset(struct netlink_ctx *ctx,
+					 const struct handle *h,
+					 const struct location *loc)
+{
+	struct nft_ruleset *rs;
+
+	rs = mnl_nft_ruleset_dump(nf_sock, h->family);
+	if (rs == NULL)
+		netlink_io_error(ctx, loc, "Could not receive ruleset: %s",
+				 strerror(errno));
+
+	return rs;
+}

src/parser.y +2 -0

index 345d8d0..fff63d3 100644
@@ -19,6 +19,8 @@
 #include <linux/netfilter/nf_tables.h>
 #include <linux/netfilter/nf_conntrack_tuple_common.h>
 
+#include <libnftnl/common.h>
+
 

From nftables POV, this is just as external as any of the preceeding

src/rule.c +1 -0

 	if (cmd->data != NULL) {
 		switch (cmd->obj) {
 		case CMD_OBJ_SETELEM:

@@ -453,6 +461,7 @@ void cmd_free(struct cmd *cmd)
 		}
 	}
 	xfree(cmd->arg);
+free:
 	xfree(cmd);
 }
 

include/rule.h struct cmd { · line 270

Quoted 7 lines

 struct cmd {
      struct list_head        list;

include/rule.h +1 -0

@@ -264,6 +267,7 @@ struct cmd {
              struct table    *table;
      };
      const void              *arg;
+     uint32_t                format;

No enum defined for this?

Thanks for your comments Patrick. I'm addressing all of them. Just one thing below.

Quoted 10 lines · Patrick McHardy

include/rule.h struct cmd { · line 270

Quoted 7 lines

 struct cmd {
      struct list_head        list;

include/rule.h +1 -0

@@ -264,6 +267,7 @@ struct cmd {
              struct table    *table;
      };
      const void              *arg;
+     uint32_t                format;

No enum defined for this?

In libnftables, there are two: enum nft_parse_type' and enum nft_output_type'.

I preferred just using uint32_t so we can reuse between export/import.