src: xml: convert family values to string

This patch translates family values to display a string:

 * ip if AF_INET
 * ip6 if AF_INET6
 * bridge if AF_BRIDGE
 * arp if 0

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/Makefile.am b/src/Makefile.am
index 401772069d196e4b7604255543e0c4efacaafed1..46496469934f20a163f647aeb0fb5d01ac15ffba 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,8 @@ lib_LTLIBRARIES = libnftables.la
 libnftables_la_LIBADD = ${LIBMNL_LIBS} ${LIBXML_LIBS}
 libnftables_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnftables.map \
                         -version-info $(LIBVERSION)
-libnftables_la_SOURCES = table.c               \
+libnftables_la_SOURCES = utils.c               \
+                        table.c                \
                         chain.c                \
                         rule.c                 \
                         set.c                  \

diff --git a/src/chain.c b/src/chain.c
index 301937b7826fafa2a2da0acdbe0142c3512aa306..e8f6c71acd8d3ae3f335766af6747df804f481df 100644 (file)
--- a/src/chain.c
+++ b/src/chain.c
@@ -515,6 +515,7 @@ static int nft_chain_xml_parse(struct nft_chain *c, char *xml)
        char *endptr = NULL;
        uint64_t utmp;
        int64_t tmp;
+       int family;
 
        /* NOTE: all XML nodes are mandatory */
 
@@ -675,13 +676,14 @@ static int nft_chain_xml_parse(struct nft_chain *c, char *xml)
                mxmlDelete(tree);
                return -1;
        }
-       utmp = strtoull(node->child->value.opaque, &endptr, 10);
-       if (utmp > UINT8_MAX || utmp < 0 || *endptr) {
+
+       family = nft_str2family(node->child->value.opaque);
+       if (family < 0) {
                mxmlDelete(tree);
                return -1;
        }
 
-       c->family = (uint32_t)utmp;
+       c->family = family;
        c->flags |= (1 << NFT_CHAIN_ATTR_FAMILY);
 
        mxmlDelete(tree);
@@ -727,14 +729,14 @@ static int nft_chain_snprintf_json(char *buf, size_t size, struct nft_chain *c)
                                "\"use\" : %d,"
                                "\"hooknum\" : \"%s\","
                                "\"policy\" : %d,"
-                               "\"family\" : %d"
+                               "\"family\" : \"%s\""
                        "}"
                "}"
                "}",
                        c->name, c->handle, c->bytes, c->packets,
                        NFT_CHAIN_JSON_VERSION, c->type, c->table,
                        c->prio, c->use, hooknum2str_array[c->hooknum],
-                       c->policy, c->family);
+                       c->policy, nft_family2str(c->family));
 }
 
 static int nft_chain_snprintf_xml(char *buf, size_t size, struct nft_chain *c)
@@ -749,22 +751,24 @@ static int nft_chain_snprintf_xml(char *buf, size_t size, struct nft_chain *c)
                                "<use>%d</use>"
                                "<hooknum>%s</hooknum>"
                                "<policy>%d</policy>"
-                               "<family>%d</family>"
+                               "<family>%s</family>"
                        "</properties>"
                "</chain>",
                        c->name, c->handle, c->bytes, c->packets,
                        NFT_CHAIN_XML_VERSION, c->type, c->table,
                        c->prio, c->use, hooknum2str_array[c->hooknum],
-                       c->policy, c->family);
+                       c->policy, nft_family2str(c->family));
 }
 
-static int nft_chain_snprintf_default(char *buf, size_t size, struct nft_chain *c)
+static int nft_chain_snprintf_default(char *buf, size_t size,
+                                     struct nft_chain *c)
 {
-       return snprintf(buf, size, "family=%u table=%s chain=%s type=%s "
+       return snprintf(buf, size, "family=%s table=%s chain=%s type=%s "
                                   "hook=%u prio=%d policy=%d use=%d "
                                   "packets=%lu bytes=%lu",
-                       c->family, c->table, c->name, c->type, c->hooknum,
-                       c->prio, c->policy, c->use, c->packets, c->bytes);
+                       nft_family2str(c->family), c->table, c->name, c->type,
+                       c->hooknum, c->prio, c->policy, c->use, c->packets,
+                       c->bytes);
 }
 
 int nft_chain_snprintf(char *buf, size_t size, struct nft_chain *c,

diff --git a/src/expr/nat.c b/src/expr/nat.c
index 7c4cf37a667d13d61e3cfc1ec4e090faba4bb84c..2061618bb3e09ea93c42705545aadf9c6d08f4f3 100644 (file)
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -213,6 +213,7 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, char *xml)
        mxml_node_t *node = NULL;
        uint64_t tmp;
        char *endptr;
+       int family;
 
        tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK);
        if (tree == NULL)
@@ -254,15 +255,13 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, char *xml)
                return -1;
        }
 
-       if (strcmp(node->child->value.opaque, "AF_INET") == 0) {
-               nat->family = AF_INET;
-       } else if (strcmp(node->child->value.opaque, "AF_INET6") == 0) {
-               nat->family = AF_INET6;
-       } else {
+       family = nft_str2family(node->child->value.opaque);
+       if (family < 0) {
                mxmlDelete(tree);
                return -1;
        }
 
+       nat->family = family;
        e->flags |= (1 << NFT_EXPR_NAT_FAMILY);
 
        /* Get and set <sreg_addr_min_v4>. Not mandatory */
@@ -349,7 +348,7 @@ nft_rule_expr_nat_snprintf_xml(char *buf, size_t size,
        }
 
        ret = snprintf(buf+offset, len, "<family>%s</family>",
-                      nat->family == AF_INET ? "AF_INET" : "AF_INET6");
+                      nft_family2str(nat->family));
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
        if (e->flags & (1 << NFT_EXPR_NAT_REG_ADDR_MIN)) {
@@ -389,8 +388,7 @@ nft_rule_expr_nat_snprintf_default(char *buf, size_t size,
                break;
        }
 
-       ret = snprintf(buf, len, "family=%s ",
-                      nat->family == AF_INET ? "AF_INET" : "AF_INET6");
+       ret = snprintf(buf, len, "family=%s ", nft_family2str(nat->family));
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
        if (e->flags & (1 << NFT_EXPR_NAT_REG_ADDR_MIN)) {

diff --git a/src/internal.h b/src/internal.h
index fffca3d43f1a3ee6d4aa15d57e802ac3bf6ac123..23a3e5903d7276e06cb1845a2bcd9ccc80917dd5 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -23,6 +23,9 @@
 #define NFT_TABLE_JSON_VERSION 0
 #define NFT_CHAIN_JSON_VERSION 0
 
+const char *nft_family2str(uint32_t family);
+int nft_str2family(const char *family);
+
 struct expr_ops;
 
 struct nft_rule_expr {

diff --git a/src/rule.c b/src/rule.c
index 00f10264dda157e1cbe77f3e9d42a967ee7e9269..e792169a8ba2d1ce32fbed6198254a3da54a62ea 100644 (file)
--- a/src/rule.c
+++ b/src/rule.c
@@ -486,6 +486,7 @@ static int nft_rule_xml_parse(struct nft_rule *r, char *xml)
        struct expr_ops *ops;
        char *endptr = NULL;
        uint64_t tmp;
+       int family;
 
        /* Load the tree */
        tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK);
@@ -509,13 +510,13 @@ static int nft_rule_xml_parse(struct nft_rule *r, char *xml)
                return -1;
        }
 
-       tmp = strtoull(mxmlElementGetAttr(tree, "family"), &endptr, 10);
-       if (tmp > UINT8_MAX || tmp < 0 || *endptr) {
+       family = nft_str2family(mxmlElementGetAttr(tree, "family"));
+       if (family < 0) {
                mxmlDelete(tree);
                return -1;
        }
 
-       r->family = (uint8_t)tmp;
+       r->family = family;
        r->flags |= (1 << NFT_RULE_ATTR_FAMILY);
 
        /* get and set <rule ... table=X ...> */
@@ -674,9 +675,9 @@ static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r,
        struct nft_rule_expr *expr;
 
        ret = snprintf(buf, size,
-               "<rule family=\"%u\" table=\"%s\" "
+               "<rule family=\"%s\" table=\"%s\" "
                        "chain=\"%s\" handle=\"%llu\" version=\"%d\">",
-                               r->family, r->table, r->chain,
+                               nft_family2str(r->family), r->table, r->chain,
                                (unsigned long long)r->handle,
                                NFT_RULE_XML_VERSION);
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
@@ -717,9 +718,9 @@ static int nft_rule_snprintf_default(char *buf, size_t size, struct nft_rule *r,
        struct nft_rule_expr *expr;
        int ret, len = size, offset = 0;
 
-       ret = snprintf(buf, size, "family=%u table=%s chain=%s handle=%llu "
+       ret = snprintf(buf, size, "family=%s table=%s chain=%s handle=%llu "
                                  "flags=%x ",
-                       r->family, r->table, r->chain,
+                       nft_family2str(r->family), r->table, r->chain,
                        (unsigned long long)r->handle, r->rule_flags);
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 

diff --git a/src/table.c b/src/table.c
index 4533e23d56bb65a38cbdb091fb6c8ea2b1bb8a5f..dc0c2a1c15f754e96e356210ec2c8dcb5a240e30 100644 (file)
--- a/src/table.c
+++ b/src/table.c
@@ -232,6 +232,7 @@ static int nft_table_xml_parse(struct nft_table *t, char *xml)
        char *endptr = NULL;
        uint64_t tmp;
        int64_t stmp;
+       int family;
 
        /* NOTE: all XML nodes are mandatory */
 
@@ -275,13 +276,13 @@ static int nft_table_xml_parse(struct nft_table *t, char *xml)
                return -1;
        }
 
-       tmp = strtoull(node->child->value.opaque, &endptr, 10);
-       if (tmp > UINT32_MAX || *endptr || tmp < 0) {
+       family = nft_str2family(node->child->value.opaque);
+       if (family < 0) {
                mxmlDelete(tree);
                return -1;
        }
 
-       t->family = (uint32_t)tmp;
+       t->family = family;
        t->flags |= (1 << NFT_TABLE_ATTR_FAMILY);
 
        /* Get and set <table_flags> */
@@ -335,32 +336,31 @@ static int nft_table_snprintf_json(char *buf, size_t size, struct nft_table *t)
                        "\"name\" : \"%s\","
                        "\"version\" : %d,"
                        "\"properties\" : {"
-                               "\"family\" : %u,"
+                               "\"family\" : \"%s\","
                                "\"table_flags\" : %d"
                                "}"
                        "}"
                        "}" ,
                        t->name, NFT_TABLE_JSON_VERSION,
-                       t->family, t->table_flags);
+                       nft_family2str(t->family), t->table_flags);
 }
 
 static int nft_table_snprintf_xml(char *buf, size_t size, struct nft_table *t)
 {
-       return snprintf(buf, size,
-                       "<table name=\"%s\" version=\"%d\">"
+       return snprintf(buf, size, "<table name=\"%s\" version=\"%d\">"
                                "<properties>"
-                                       "<family>%u</family>"
+                                       "<family>%s</family>"
                                        "<table_flags>%d</table_flags>"
                                "</properties>"
-                       "</table>" ,
-                       t->name, NFT_TABLE_XML_VERSION,
-                       t->family, t->table_flags);
+                               "</table>",
+                      t->name, NFT_TABLE_XML_VERSION,
+                      nft_family2str(t->family), t->table_flags);
 }
 
 static int nft_table_snprintf_default(char *buf, size_t size, struct nft_table *t)
 {
-       return snprintf(buf, size, "table=%s family=%u flags=%x",
-                       t->name, t->family, t->table_flags);
+       return snprintf(buf, size, "table=%s family=%s flags=%x",
+                       t->name, nft_family2str(t->family), t->table_flags);
 }
 
 int nft_table_snprintf(char *buf, size_t size, struct nft_table *t,

diff --git a/src/utils.c b/src/utils.c
new file mode 100644 (file)
index 0000000..9416540
--- /dev/null
+++ b/src/utils.c
@@ -0,0 +1,46 @@
+/*
+ * (C) 2012-2013 by Pablo Neira Ayuso <pablo@netfilter.org>
+ * (C) 2013 by Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <internal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <stdint.h>
+#include <arpa/inet.h>
+
+const char *nft_family2str(uint32_t family)
+{
+       switch (family) {
+       case AF_INET:
+               return "ip";
+       case AF_INET6:
+               return "ip6";
+       case AF_BRIDGE:
+               return "bridge";
+       case 0:
+               return "arp";
+       default:
+               return "unknown";
+       }
+}
+
+int nft_str2family(const char *family)
+{
+       if (strcmp(family, "ip") == 0)
+               return AF_INET;
+       else if (strcmp(family, "ip6") == 0)
+               return AF_INET6;
+       else if (strcmp(family, "bridge") == 0)
+               return AF_BRIDGE;
+       else if (strcmp(family, "arp") == 0)
+               return 0;
+
+       return -1;
+}

diff --git a/test/nft-chain-xml-add.sh b/test/nft-chain-xml-add.sh
index fda28cbbca497df04c806c841090ff447d52c2db..ab50e2b4aa587d515dec880d22a1ed7bca53a661 100755 (executable)
--- a/test/nft-chain-xml-add.sh
+++ b/test/nft-chain-xml-add.sh
@@ -42,7 +42,7 @@ XML="<chain name=\"test1\" handle=\"100\" bytes=\"123\" packets=\"321\" version=
                 <use>0</use>
                 <hooknum>NF_INET_LOCAL_IN</hooknum>
                 <policy>1</policy>
-                <family>2</family>
+                <family>ip</family>
         </properties>
 </chain>"
 
@@ -63,7 +63,7 @@ XML="<chain name=\"test2\" handle=\"101\" bytes=\"59\" packets=\"1\" version=\"0
                <use>0</use>
                <hooknum>NF_INET_POST_ROUTING</hooknum>
                <policy>1</policy>
-               <family>10</family>
+               <family>ip6</family>
        </properties>
 </chain>"
 
@@ -85,7 +85,7 @@ XML="<chain name=\"test3\" handle=\"102\" bytes=\"51231239\" packets=\"112312312
                <use>0</use>
                <hooknum>NF_INET_FORWARD</hooknum>
                <policy>1</policy>
-               <family>2</family>
+               <family>ip</family>
        </properties>
 </chain>"
 

diff --git a/test/nft-rule-xml-add.sh b/test/nft-rule-xml-add.sh
index 426b97591cc9d070ccf0047d6f03802feb8a1ced..961b597d07d8add294013a30e07b1a99bc4beb8a 100755 (executable)
--- a/test/nft-rule-xml-add.sh
+++ b/test/nft-rule-xml-add.sh
@@ -33,9 +33,8 @@ fi
 
 [ ! -x "$NFT" ] && echo "W: nftables main binary not found but continuing anyway $NFT"
 
-XML="<rule family=\"2\" table=\"filter\" chain=\"INPUT\" handle=\"100\" version=\"0\">
+XML="<rule family=\"ip\" table=\"filter\" chain=\"INPUT\" handle=\"100\" version=\"0\">
   <rule_flags>0</rule_flags>
-  <flags>127</flags>
   <compat_flags>0</compat_flags>
   <compat_proto>0</compat_proto>
   <expr type=\"meta\">

diff --git a/test/nft-table-xml-add.sh b/test/nft-table-xml-add.sh
index 2c55edcfb56814a5777676f6ea28feaaddc54619..30b65e1044e9f7728f50cc0ec4fa391b81e4ed51 100755 (executable)
--- a/test/nft-table-xml-add.sh
+++ b/test/nft-table-xml-add.sh
@@ -40,7 +40,7 @@ fi
 # This is valid
 XML="<table name=\"filter_test\" version=\"0\">
        <properties>
-               <family>2</family>
+               <family>ip</family>
                <table_flags>0</table_flags>
        </properties>
 </table>"
@@ -57,7 +57,7 @@ fi
 # This is valid
 XML="<table name=\"filter6_test\" version=\"0\">
        <properties>
-               <family>10</family>
+               <family>ip6</family>
                <table_flags>0</table_flags>
        </properties>
 </table>"