meta: Add support for datatype devgroup

This adds the new devgroup datatype to get the group name from
/etc/iproute2/group file.

Example of use:

nft add rule ip test input meta iifgroup 0 counter
nft add rule ip test input meta iifgroup default counter

Moreover, It adds tests in meta.t test file.

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/datatype.h b/include/datatype.h
index 15fea4418d5ecae5f0df827141e2c0a92ba03223..3f13dcde47cc07117fdf7d7908cfd06667c0d2fd 100644 (file)
--- a/include/datatype.h
+++ b/include/datatype.h
@@ -39,6 +39,7 @@
  * @TYPE_ICMP_CODE:    icmp code (integer subtype)
  * @TYPE_ICMPV6_CODE:  icmpv6 code (integer subtype)
  * @TYPE_ICMPX_CODE:   icmpx code (integer subtype)
+ * @TYPE_DEVGROUP:     devgroup code (integer subtype)
  */
 enum datatypes {
        TYPE_INVALID,
@@ -76,6 +77,7 @@ enum datatypes {
        TYPE_ICMP_CODE,
        TYPE_ICMPV6_CODE,
        TYPE_ICMPX_CODE,
+       TYPE_DEVGROUP,
        __TYPE_MAX
 };
 #define TYPE_MAX               (__TYPE_MAX - 1)

diff --git a/src/meta.c b/src/meta.c
index cea3ccbb5694a58209e29c6c05e10a2e69aa51f0..faa29eb8bf8a5bcc1cdae7e439ca1357664a5bdf 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -349,6 +349,40 @@ static const struct datatype pkttype_type = {
        .parse          = pkttype_type_parse,
 };
 
+static struct symbol_table *devgroup_tbl;
+static void __init devgroup_table_init(void)
+{
+       devgroup_tbl = rt_symbol_table_init("/etc/iproute2/group");
+}
+
+static void __exit devgroup_table_exit(void)
+{
+       rt_symbol_table_free(devgroup_tbl);
+}
+
+static void devgroup_type_print(const struct expr *expr)
+{
+       return symbolic_constant_print(devgroup_tbl, expr);
+}
+
+static struct error_record *devgroup_type_parse(const struct expr *sym,
+                                               struct expr **res)
+{
+       return symbolic_constant_parse(sym, devgroup_tbl, res);
+}
+
+static const struct datatype devgroup_type = {
+       .type           = TYPE_DEVGROUP,
+       .name           = "devgroup",
+       .desc           = "devgroup name",
+       .byteorder      = BYTEORDER_HOST_ENDIAN,
+       .size           = 4 * BITS_PER_BYTE,
+       .basetype       = &integer_type,
+       .print          = devgroup_type_print,
+       .parse          = devgroup_type_parse,
+       .flags          = DTYPE_F_PREFIX,
+};
+
 static const struct meta_template meta_templates[] = {
        [NFT_META_LEN]          = META_TEMPLATE("length",    &integer_type,
                                                4 * 8, BYTEORDER_HOST_ENDIAN),
@@ -396,10 +430,10 @@ static const struct meta_template meta_templates[] = {
        [NFT_META_CPU]          = META_TEMPLATE("cpu",  &integer_type,
                                                4 * BITS_PER_BYTE,
                                                BYTEORDER_HOST_ENDIAN),
-       [NFT_META_IIFGROUP]     = META_TEMPLATE("iifgroup", &integer_type,
+       [NFT_META_IIFGROUP]     = META_TEMPLATE("iifgroup", &devgroup_type,
                                                4 * BITS_PER_BYTE,
                                                BYTEORDER_HOST_ENDIAN),
-       [NFT_META_OIFGROUP]     = META_TEMPLATE("oifgroup", &integer_type,
+       [NFT_META_OIFGROUP]     = META_TEMPLATE("oifgroup", &devgroup_type,
                                                4 * BITS_PER_BYTE,
                                                BYTEORDER_HOST_ENDIAN),
 };
@@ -546,4 +580,5 @@ static void __init meta_init(void)
        datatype_register(&tchandle_type);
        datatype_register(&uid_type);
        datatype_register(&gid_type);
+       datatype_register(&devgroup_type);
 }

diff --git a/tests/regression/any/meta.t b/tests/regression/any/meta.t
index 5bc38724ae24a4c062f7b1c0a9476696aa596497..1e7a0fe76738a6d67ff238df56adb8f7f017efbf 100644 (file)
--- a/tests/regression/any/meta.t
+++ b/tests/regression/any/meta.t
@@ -158,3 +158,24 @@ meta cpu 1-3;ok;cpu >= 1 cpu <= 3
 meta cpu != 1-2;ok;cpu < 1 cpu > 2
 meta cpu { 2,3};ok;cpu { 2, 3}
 -meta cpu != { 2,3};ok
+
+meta iifgroup 0;ok;iifgroup default
+meta iifgroup != 0;ok;iifgroup != default
+meta iifgroup default;ok;iifgroup default
+meta iifgroup != default;ok;iifgroup != default
+meta iifgroup {default};ok;;iifgroup {default}
+- meta iifgroup != {default};ok
+meta iifgroup {11,33};ok;oifgroup {11,33}
+meta iifgroup {11-33};ok
+- meta iifgroup != {11,33};ok
+- meta iifgroup != {11-33};ok
+meta oifgroup 0;ok;oifgroup default
+meta oifgroup != 0;ok;oifgroup != default
+meta oifgroup default;ok;oifgroup default
+meta oifgroup != default;ok;oifgroup != default
+meta oifgroup {default};ok;oifgroup {default}
+- meta oifgroup != {default};ok
+meta oifgroup {11,33};ok;oifgroup {11,33}
+meta oifgroup {11-33};ok
+- meta oifgroup != {11,33};ok
+- meta oifgroup != {11-33};ok