src: quote user-defined strings when used from rule selectors

The following selectors display strings using quotes:

* meta iifname
* meta oifname
* meta ibriport
* meta obriport

However, the following do not:

* meta oif
* meta iif
* meta skuid
* meta skgid
* meta iifgroup
* meta oifgroup
* meta rtclassid
* ct label

Given they refer to user-defined values, neither keywords nor internal
built-in known values, let's quote the output of this.

This patch modifies symbolic_constant_print() so we can signal this to
indicate if the string needs to be quoted.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/datatype.h b/include/datatype.h
index c7e110f5af88f72f3bece4090705f0503d20ad97..3eb686e268c53dac4d2dde72d5ba7dce08656f5b 100644 (file)
--- a/include/datatype.h
+++ b/include/datatype.h
@@ -188,7 +188,7 @@ extern struct error_record *symbolic_constant_parse(const struct expr *sym,
                                                    const struct symbol_table *tbl,
                                                    struct expr **res);
 extern void symbolic_constant_print(const struct symbol_table *tbl,
-                                   const struct expr *expr);
+                                   const struct expr *expr, bool quotes);
 extern void symbol_table_print(const struct symbol_table *tbl,
                               const struct datatype *dtype);
 

diff --git a/src/ct.c b/src/ct.c
index f6018d87c02d6716a2582617c82cfd364ea7cc80..357559629c66b229b9ca80d8153945287a0c032f 100644 (file)
--- a/src/ct.c
+++ b/src/ct.c
@@ -108,7 +108,7 @@ static void ct_label_type_print(const struct expr *expr)
        for (s = ct_label_tbl->symbols; s->identifier != NULL; s++) {
                if (bit != s->value)
                        continue;
-               printf("%s", s->identifier);
+               printf("\"%s\"", s->identifier);
                return;
        }
        /* can happen when connlabel.conf is altered after rules were added */

diff --git a/src/datatype.c b/src/datatype.c
index 002c4c6625bae80ee409dc30212829d41c9ca240..2b1619a6fd054f87d5866259e9bb19f50bf02c02 100644 (file)
--- a/src/datatype.c
+++ b/src/datatype.c
@@ -86,7 +86,8 @@ void datatype_print(const struct expr *expr)
                if (dtype->print != NULL)
                        return dtype->print(expr);
                if (dtype->sym_tbl != NULL)
-                       return symbolic_constant_print(dtype->sym_tbl, expr);
+                       return symbolic_constant_print(dtype->sym_tbl, expr,
+                                                      false);
        } while ((dtype = dtype->basetype));
 
        BUG("datatype %s has no print method or symbol table\n",
@@ -154,7 +155,7 @@ out:
 }
 
 void symbolic_constant_print(const struct symbol_table *tbl,
-                            const struct expr *expr)
+                            const struct expr *expr, bool quotes)
 {
        unsigned int len = div_round_up(expr->len, BITS_PER_BYTE);
        const struct symbolic_constant *s;
@@ -173,7 +174,10 @@ void symbolic_constant_print(const struct symbol_table *tbl,
        if (s->identifier == NULL)
                return expr_basetype(expr)->print(expr);
 
-       printf("%s", s->identifier);
+       if (quotes)
+               printf("\"%s\"", s->identifier);
+       else
+               printf("%s", s->identifier);
 }
 
 void symbol_table_print(const struct symbol_table *tbl,
@@ -684,7 +688,7 @@ static void __exit mark_table_exit(void)
 
 static void mark_type_print(const struct expr *expr)
 {
-       return symbolic_constant_print(mark_tbl, expr);
+       return symbolic_constant_print(mark_tbl, expr, true);
 }
 
 static struct error_record *mark_type_parse(const struct expr *sym,

diff --git a/src/meta.c b/src/meta.c
index 9dd91de389aef0a7ff08e0d8efbd19c6e67b579d..94263f90c28a8cef5386e492e2f823a9edc81a18 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -47,7 +47,7 @@ static void __exit realm_table_exit(void)
 
 static void realm_type_print(const struct expr *expr)
 {
-       return symbolic_constant_print(realm_tbl, expr);
+       return symbolic_constant_print(realm_tbl, expr, true);
 }
 
 static struct error_record *realm_type_parse(const struct expr *sym,
@@ -144,7 +144,7 @@ static void ifindex_type_print(const struct expr *expr)
 
        ifindex = mpz_get_uint32(expr->value);
        if (nft_if_indextoname(ifindex, name))
-               printf("%s", name);
+               printf("\"%s\"", name);
        else
                printf("%d", ifindex);
 }
@@ -208,7 +208,7 @@ static void uid_type_print(const struct expr *expr)
 
                pw = getpwuid(uid);
                if (pw != NULL)
-                       printf("%s", pw->pw_name);
+                       printf("\"%s\"", pw->pw_name);
                else
                        printf("%d", uid);
                return;
@@ -260,7 +260,7 @@ static void gid_type_print(const struct expr *expr)
 
                gr = getgrgid(gid);
                if (gr != NULL)
-                       printf("%s", gr->gr_name);
+                       printf("\"%s\"", gr->gr_name);
                else
                        printf("%u", gid);
                return;
@@ -314,7 +314,7 @@ static const struct symbol_table pkttype_type_tbl = {
 
 static void pkttype_type_print(const struct expr *expr)
 {
-       return symbolic_constant_print(&pkttype_type_tbl, expr);
+       return symbolic_constant_print(&pkttype_type_tbl, expr, false);
 }
 
 static const struct datatype pkttype_type = {
@@ -341,7 +341,7 @@ static void __exit devgroup_table_exit(void)
 
 static void devgroup_type_print(const struct expr *expr)
 {
-       return symbolic_constant_print(devgroup_tbl, expr);
+       return symbolic_constant_print(devgroup_tbl, expr, true);
 }
 
 static struct error_record *devgroup_type_parse(const struct expr *sym,

diff --git a/src/proto.c b/src/proto.c
index 4c12977cef082bfac7832db9f048badcc4d6f671..94995f10e4e38389b68526a67d05f0302b9211a7 100644 (file)
--- a/src/proto.c
+++ b/src/proto.c
@@ -871,7 +871,7 @@ static const struct symbol_table ethertype_tbl = {
 
 static void ethertype_print(const struct expr *expr)
 {
-       return symbolic_constant_print(&ethertype_tbl, expr);
+       return symbolic_constant_print(&ethertype_tbl, expr, false);
 }
 
 const struct datatype ethertype_type = {

diff --git a/tests/py/any/dup.t b/tests/py/any/dup.t
index 7df24a1cbe9b9b1775b4dc8f9256cfb02131957d..d42cf343d7d16bfcab2eafa4159924229592aada 100644 (file)
--- a/tests/py/any/dup.t
+++ b/tests/py/any/dup.t
@@ -2,6 +2,6 @@
 
 *netdev;test-netdev;ingress
 
-dup to lo;ok
-dup to mark map { 0x00000001 : lo, 0x00000002 : lo};ok
+dup to "lo";ok
+dup to mark map { 0x00000001 : "lo", 0x00000002 : "lo"};ok
 

diff --git a/tests/py/any/dup.t.payload b/tests/py/any/dup.t.payload
index b1d6d16458ebaefefe73d1fd571fa22aab33f881..4a615b2fe2e96cd95cec89d8cec5f6feb2f18dd6 100644 (file)
--- a/tests/py/any/dup.t.payload
+++ b/tests/py/any/dup.t.payload
@@ -1,9 +1,9 @@
-# dup to lo
+# dup to "lo"
 netdev test-netdev ingress 
   [ immediate reg 1 0x00000001 ]
   [ dup sreg_dev 1 ]
 
-# dup to mark map { 0x00000001 : lo, 0x00000002 : lo}
+# dup to mark map { 0x00000001 : "lo", 0x00000002 : "lo"}
 __map%d test-netdev b
 __map%d test-netdev 0
        element 00000001  : 00000001 0 [end]    element 00000002  : 00000001 0 [end]

diff --git a/tests/py/any/fwd.t b/tests/py/any/fwd.t
index fb15aced354588523467bb80b3fcf03977adc607..d9b4514ee29a1cefa181f58e16839d95b458f25a 100644 (file)
--- a/tests/py/any/fwd.t
+++ b/tests/py/any/fwd.t
@@ -2,6 +2,6 @@
 
 *netdev;test-netdev;ingress
 
-fwd to lo;ok
-fwd to mark map { 0x00000001 : lo, 0x00000002 : lo};ok
+fwd to "lo";ok
+fwd to mark map { 0x00000001 : "lo", 0x00000002 : "lo"};ok
 

diff --git a/tests/py/any/fwd.t.payload b/tests/py/any/fwd.t.payload
index 0402b7a96899657fc0dee03d07a03f25c8dcf8ad..696b55efe82078ad8f479236a00b8d78189d8db9 100644 (file)
--- a/tests/py/any/fwd.t.payload
+++ b/tests/py/any/fwd.t.payload
@@ -1,9 +1,9 @@
-# fwd to lo
+# fwd to "lo"
 netdev test-netdev ingress 
   [ immediate reg 1 0x00000001 ]
   [ fwd sreg_dev 1 ]
 
-# fwd to mark map { 0x00000001 : lo, 0x00000002 : lo}
+# fwd to mark map { 0x00000001 : "lo", 0x00000002 : "lo"}
 __map%d test-netdev b
 __map%d test-netdev 0
        element 00000001  : 00000001 0 [end]    element 00000002  : 00000001 0 [end]

diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t
index 909de8bc0d5572f42557d2958493638e01a5e85e..9015a219187d8ad93f672eb3d45f535af9061e46 100644 (file)
--- a/tests/py/any/meta.t
+++ b/tests/py/any/meta.t
@@ -61,10 +61,10 @@ meta mark or 0x03 != 0x01;ok;mark | 0x00000003 != 0x00000001
 meta mark xor 0x03 == 0x01;ok;mark 0x00000002
 meta mark xor 0x03 != 0x01;ok;mark != 0x00000002
 
-meta iif eth0 accept;ok;iif eth0 accept
-meta iif eth0 accept;ok;iif eth0 accept
-meta iif != eth0 accept;ok;iif != eth0 accept
-meta iif != eth0 accept;ok;iif != eth0 accept
+meta iif "eth0" accept;ok;iif "eth0" accept
+meta iif "eth0" accept;ok;iif "eth0" accept
+meta iif != "eth0" accept;ok;iif != "eth0" accept
+meta iif != "eth0" accept;ok;iif != "eth0" accept
 
 meta iifname "eth0";ok;iifname "eth0"
 meta iifname != "eth0";ok;iifname != "eth0"
@@ -80,10 +80,10 @@ meta iiftype ether;ok;iiftype ether
 meta iiftype != ppp;ok;iiftype != ppp
 meta iiftype ppp;ok;iiftype ppp
 
-meta oif lo accept;ok;oif lo accept
-meta oif != lo accept;ok;oif != lo accept
-meta oif {eth0, lo} accept;ok
-- meta oif != {eth0, lo} accept;ok
+meta oif "lo" accept;ok;oif "lo" accept
+meta oif != "lo" accept;ok;oif != "lo" accept
+meta oif {"eth0", "lo"} accept;ok
+- meta oif != {"eth0", "lo"} accept;ok
 
 meta oifname "eth0";ok;oifname "eth0"
 meta oifname != "eth0";ok;oifname != "eth0"
@@ -97,10 +97,10 @@ meta oiftype {ether, ppp, ipip, ipip6, loopback, sit, ipgre};ok
 meta oiftype != ether;ok;oiftype != ether
 meta oiftype ether;ok;oiftype ether
 
-meta skuid {bin, root, daemon} accept;ok;skuid { 0, 1, 2} accept
-- meta skuid != {bin, root, daemon} accept;ok
-meta skuid root;ok;skuid 0
-meta skuid != root;ok;skuid != 0
+meta skuid {"bin", "root", "daemon"} accept;ok;skuid { 0, 1, 2} accept
+- meta skuid != {"bin", "root", "daemon"} accept;ok
+meta skuid "root";ok;skuid 0
+meta skuid != "root";ok;skuid != 0
 meta skuid lt 3000 accept;ok;skuid < 3000 accept
 meta skuid gt 3000 accept;ok;skuid > 3000 accept
 meta skuid eq 3000 accept;ok;skuid 3000 accept
@@ -109,10 +109,10 @@ meta skuid != 2001-2005 accept;ok;skuid != 2001-2005 accept
 meta skuid { 2001-2005} accept;ok;skuid { 2001-2005} accept
 - meta skuid != { 2001-2005} accept;ok
 
-meta skgid {bin, root, daemon} accept;ok;skgid { 0, 1, 2} accept
-- meta skgid != {bin, root, daemon} accept;ok
-meta skgid root;ok;skgid 0
-meta skgid != root;ok;skgid != 0
+meta skgid {"bin", "root", "daemon"} accept;ok;skgid { 0, 1, 2} accept
+- meta skgid != {"bin", "root", "daemon"} accept;ok
+meta skgid "root";ok;skgid 0
+meta skgid != "root";ok;skgid != 0
 meta skgid lt 3000 accept;ok;skgid < 3000 accept
 meta skgid gt 3000 accept;ok;skgid > 3000 accept
 meta skgid eq 3000 accept;ok;skgid 3000 accept
@@ -140,15 +140,15 @@ meta mark set 0xffffffde or 0x16;ok;mark set 0xffffffde
 meta mark set 0x32 or 0xfffff;ok;mark set 0x000fffff
 meta mark set 0xfffe xor 0x16;ok;mark set 0x0000ffe8
 
-meta iif lo;ok;iif lo
-meta oif lo;ok;oif lo
+meta iif "lo";ok;iif "lo"
+meta oif "lo";ok;oif "lo"
 meta oifname "eth2" accept;ok;oifname "eth2" accept
 meta skuid 3000;ok;skuid 3000
 meta skgid 3000;ok;skgid 3000
 # BUG:  meta nftrace 1;ok
 # <cmdline>:1:1-37: Error: Could not process rule: Operation not supported
 - meta nftrace 1;ok
-meta rtclassid cosmos;ok;rtclassid cosmos
+meta rtclassid "cosmos";ok;rtclassid "cosmos"
 
 meta pkttype broadcast;ok;pkttype broadcast
 meta pkttype unicast;ok;pkttype unicast
@@ -167,22 +167,22 @@ meta cpu { 2,3};ok;cpu { 2,3}
 meta cpu { 2-3, 5-7};ok
 -meta cpu != { 2,3};ok; cpu != { 2,3}
 
-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 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
 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 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
 meta oifgroup {11-33};ok
 - meta oifgroup != {11,33};ok
@@ -197,9 +197,9 @@ meta cgroup != 1048577-1048578;ok;cgroup != 1048577-1048578
 meta cgroup {1048577-1048578};ok;cgroup { 1048577-1048578}
 # meta cgroup != { 1048577-1048578};ok;cgroup != { 1048577-1048578}
 
-meta iif . meta oif { lo . eth0 };ok
-meta iif . meta oif . meta mark { lo . eth0 . 0x0000000a };ok
-meta iif . meta oif vmap { lo . eth0 : drop };ok
+meta iif . meta oif { "lo" . "eth0" };ok
+meta iif . meta oif . meta mark { "lo" . "eth0" . 0x0000000a };ok
+meta iif . meta oif vmap { "lo" . "eth0" : drop };ok
 
 meta random eq 1;ok;meta random 1
 meta random gt 1000000;ok;meta random > 1000000

diff --git a/tests/py/any/meta.t.payload b/tests/py/any/meta.t.payload
index acd785102454ad9c4eaca8e11b549f1e4608a459..0affd9258966269bec64783ae95311d914754d8a 100644 (file)
--- a/tests/py/any/meta.t.payload
+++ b/tests/py/any/meta.t.payload
@@ -193,25 +193,25 @@ ip test-ip4 input
   [ meta load mark => reg 1 ]
   [ cmp neq reg 1 0x00000002 ]
 
-# meta iif eth0 accept
+# meta iif "eth0" accept
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000002 ]
   [ immediate reg 0 accept ]
 
-# meta iif eth0 accept
+# meta iif "eth0" accept
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000002 ]
   [ immediate reg 0 accept ]
 
-# meta iif != eth0 accept
+# meta iif != "eth0" accept
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp neq reg 1 0x00000002 ]
   [ immediate reg 0 accept ]
 
-# meta iif != eth0 accept
+# meta iif != "eth0" accept
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp neq reg 1 0x00000002 ]
@@ -273,19 +273,19 @@ ip test-ip4 input
   [ meta load iiftype => reg 1 ]
   [ cmp eq reg 1 0x00000200 ]
 
-# meta oif lo accept
+# meta oif "lo" accept
 ip test-ip4 input
   [ meta load oif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
   [ immediate reg 0 accept ]
 
-# meta oif != lo accept
+# meta oif != "lo" accept
 ip test-ip4 input
   [ meta load oif => reg 1 ]
   [ cmp neq reg 1 0x00000001 ]
   [ immediate reg 0 accept ]
 
-# meta oif {eth0, lo} accept
+# meta oif {"eth0", "lo"} accept
 __set%d test-ip4 3
 __set%d test-ip4 0
        element 00000002  : 0 [end]     element 00000001  : 0 [end]
@@ -340,7 +340,7 @@ ip test-ip4 input
   [ meta load oiftype => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# meta skuid {bin, root, daemon} accept
+# meta skuid {"bin", "root", "daemon"} accept
 __set%d test-ip4 3
 __set%d test-ip4 0
        element 00000001  : 0 [end]     element 00000000  : 0 [end]     element 00000002  : 0 [end]
@@ -349,12 +349,12 @@ ip test-ip4 input
   [ lookup reg 1 set __set%d ]
   [ immediate reg 0 accept ]
 
-# meta skuid root
+# meta skuid "root"
 ip test-ip4 input
   [ meta load skuid => reg 1 ]
   [ cmp eq reg 1 0x00000000 ]
 
-# meta skuid != root
+# meta skuid != "root"
 ip test-ip4 input
   [ meta load skuid => reg 1 ]
   [ cmp neq reg 1 0x00000000 ]
@@ -405,7 +405,7 @@ ip test-ip4 input
   [ lookup reg 1 set __set%d ]
   [ immediate reg 0 accept ]
 
-# meta skgid {bin, root, daemon} accept
+# meta skgid {"bin", "root", "daemon"} accept
 __set%d test-ip4 3
 __set%d test-ip4 0
        element 00000001  : 0 [end]     element 00000000  : 0 [end]     element 00000002  : 0 [end]
@@ -414,12 +414,12 @@ ip test-ip4 input
   [ lookup reg 1 set __set%d ]
   [ immediate reg 0 accept ]
 
-# meta skgid root
+# meta skgid "root"
 ip test-ip4 input
   [ meta load skgid => reg 1 ]
   [ cmp eq reg 1 0x00000000 ]
 
-# meta skgid != root
+# meta skgid != "root"
 ip test-ip4 input
   [ meta load skgid => reg 1 ]
   [ cmp neq reg 1 0x00000000 ]
@@ -510,12 +510,12 @@ ip test-ip4 input
   [ immediate reg 1 0x0000ffe8 ]
   [ meta set mark with reg 1 ]
 
-# meta iif lo
+# meta iif "lo"
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
-# meta oif lo
+# meta oif "lo"
 ip test-ip4 input
   [ meta load oif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -536,7 +536,7 @@ ip test-ip4 input
   [ meta load skgid => reg 1 ]
   [ cmp eq reg 1 0x00000bb8 ]
 
-# meta rtclassid cosmos
+# meta rtclassid "cosmos"
 ip test-ip4 input
   [ meta load rtclassid => reg 1 ]
   [ cmp eq reg 1 0x00000000 ]
@@ -631,17 +631,17 @@ ip test-ip4 input
   [ meta load iifgroup => reg 1 ]
   [ cmp neq reg 1 0x00000000 ]
 
-# meta iifgroup default
+# meta iifgroup "default"
 ip test-ip4 input
   [ meta load iifgroup => reg 1 ]
   [ cmp eq reg 1 0x00000000 ]
 
-# meta iifgroup != default
+# meta iifgroup != "default"
 ip test-ip4 input
   [ meta load iifgroup => reg 1 ]
   [ cmp neq reg 1 0x00000000 ]
 
-# meta iifgroup {default}
+# meta iifgroup {"default"}
 __set%d test-ip4 3
 __set%d test-ip4 0
        element 00000000  : 0 [end]
@@ -676,17 +676,17 @@ ip test-ip4 input
   [ meta load oifgroup => reg 1 ]
   [ cmp neq reg 1 0x00000000 ]
 
-# meta oifgroup default
+# meta oifgroup "default"
 ip test-ip4 input
   [ meta load oifgroup => reg 1 ]
   [ cmp eq reg 1 0x00000000 ]
 
-# meta oifgroup != default
+# meta oifgroup != "default"
 ip test-ip4 input
   [ meta load oifgroup => reg 1 ]
   [ cmp neq reg 1 0x00000000 ]
 
-# meta oifgroup {default}
+# meta oifgroup {"default"}
 __set%d test-ip4 3
 __set%d test-ip4 0
        element 00000000  : 0 [end]
@@ -753,7 +753,7 @@ ip test-ip4 input
   [ lookup reg 1 set __set%d ]
 
 
-# meta iif . meta oif { lo . eth0 }
+# meta iif . meta oif { "lo" . "eth0" }
 __set%d test-ip4 3
 __set%d test-ip4 0
        element 00000001 00000002  : 0 [end]
@@ -762,7 +762,7 @@ ip test-ip4 output
   [ meta load oif => reg 9 ]
   [ lookup reg 1 set __set%d ]
 
-# meta iif . meta oif . meta mark { lo . eth0 . 0x0000000a }
+# meta iif . meta oif . meta mark { "lo" . "eth0" . 0x0000000a }
 __set%d test-ip4 3
 __set%d test-ip4 0
        element 00000001 00000002 0000000a  : 0 [end]
@@ -772,7 +772,7 @@ ip test-ip4 output
   [ meta load mark => reg 10 ]
   [ lookup reg 1 set __set%d ]
 
-# meta iif . meta oif vmap { lo . eth0 : drop }
+# meta iif . meta oif vmap { "lo" . "eth0" : drop }
 __map%d test-ip4 b
 __map%d test-ip4 0
        element 00000001 00000002  : 0 [end]

diff --git a/tests/py/inet/udp.t b/tests/py/inet/udp.t
index ea9c87b4a58a1c5b67faa3f18709f20d4464890a..060985c862a06d2e6cca2bbe0439023e063737e1 100644 (file)
--- a/tests/py/inet/udp.t
+++ b/tests/py/inet/udp.t
@@ -52,5 +52,5 @@ udp checksum { 33-55};ok
 - udp checksum != { 33-55};ok
 
 # limit impact to lo
-iif lo udp checksum set 0;ok
-iif lo udp dport set 65535;ok
+iif "lo" udp checksum set 0;ok
+iif "lo" udp dport set 65535;ok

diff --git a/tests/py/inet/udp.t.payload.inet b/tests/py/inet/udp.t.payload.inet
index 1f49438df8fe30c070629dc498bb918748b80d78..a2717f39ec0811f73ddcf844232b204dcd45654c 100644 (file)
--- a/tests/py/inet/udp.t.payload.inet
+++ b/tests/py/inet/udp.t.payload.inet
@@ -220,7 +220,7 @@ inet test-inet input
   [ payload load 2b @ transport header + 6 => reg 1 ]
   [ lookup reg 1 set __set%d ]
 
-# iif lo udp checksum set 0
+# iif "lo" udp checksum set 0
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -229,7 +229,7 @@ inet test-inet input
   [ immediate reg 1 0x00000000 ]
   [ payload write reg 1 => 2b @ transport header + 6 csum_type 1 csum_off 6 ]
 
-# iif lo udp dport set 65535
+# iif "lo" udp dport set 65535
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]

diff --git a/tests/py/inet/udp.t.payload.ip b/tests/py/inet/udp.t.payload.ip
index 8b4550dcab84ec8cb0f3d53cda9ead90eac13dfa..5d36fe5f4d7dba117adeedbe8fcc05ce207f65e4 100644 (file)
--- a/tests/py/inet/udp.t.payload.ip
+++ b/tests/py/inet/udp.t.payload.ip
@@ -220,7 +220,7 @@ ip test-ip4 input
   [ payload load 2b @ transport header + 6 => reg 1 ]
   [ lookup reg 1 set __set%d ]
 
-# iif lo udp checksum set 0
+# iif "lo" udp checksum set 0
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -229,7 +229,7 @@ ip test-ip4 input
   [ immediate reg 1 0x00000000 ]
   [ payload write reg 1 => 2b @ transport header + 6 csum_type 1 csum_off 6 ]
 
-# iif lo udp dport set 65535
+# iif "lo" udp dport set 65535
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]

diff --git a/tests/py/inet/udp.t.payload.ip6 b/tests/py/inet/udp.t.payload.ip6
index 86204f6c8b1312cacdeb64c2316d25bd63d8bc6e..22aa57ff80772d8e9a884b59ece758111e24c9ef 100644 (file)
--- a/tests/py/inet/udp.t.payload.ip6
+++ b/tests/py/inet/udp.t.payload.ip6
@@ -220,7 +220,7 @@ ip6 test-ip6 input
   [ payload load 2b @ transport header + 6 => reg 1 ]
   [ lookup reg 1 set __set%d ]
 
-# iif lo udp checksum set 0
+# iif "lo" udp checksum set 0
 ip6 test-ip6 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -229,7 +229,7 @@ ip6 test-ip6 input
   [ immediate reg 1 0x00000000 ]
   [ payload write reg 1 => 2b @ transport header + 6 csum_type 1 csum_off 6 ]
 
-# iif lo udp dport set 65535
+# iif "lo" udp dport set 65535
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]

diff --git a/tests/py/inet/udp.t.payload.netdev b/tests/py/inet/udp.t.payload.netdev
index 2eb2a76d3b56041d620dcdfffc7534c004ec0eaa..92858cf0b9a1a9c59e8980993975019df5f47493 100644 (file)
--- a/tests/py/inet/udp.t.payload.netdev
+++ b/tests/py/inet/udp.t.payload.netdev
@@ -220,7 +220,7 @@ inet test-inet input
   [ payload load 2b @ transport header + 6 => reg 1 ]
   [ lookup reg 1 set __set%d ]
 
-# iif lo udp checksum set 0
+# iif "lo" udp checksum set 0
 netdev test-netdev ingress
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -229,7 +229,7 @@ netdev test-netdev ingress
   [ immediate reg 1 0x00000000 ]
   [ payload write reg 1 => 2b @ transport header + 6 csum_type 1 csum_off 6 ]
 
-# iif lo udp dport set 65535
+# iif "lo" udp dport set 65535
 netdev test-netdev ingress
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]

diff --git a/tests/py/ip/dup.t b/tests/py/ip/dup.t
index ac4e83a2cd2179df9afe7d786c5013d8e838af13..5119636abf407e3813cba43eb4f6fe92331d7027 100644 (file)
--- a/tests/py/ip/dup.t
+++ b/tests/py/ip/dup.t
@@ -3,5 +3,5 @@
 *ip;test-ip4;input
 
 dup to 192.168.2.1;ok
-dup to 192.168.2.1 device eth0;ok
-dup to ip saddr map { 192.168.2.120 : 192.168.2.1 } device eth0;ok
+dup to 192.168.2.1 device "eth0";ok
+dup to ip saddr map { 192.168.2.120 : 192.168.2.1 } device "eth0";ok

diff --git a/tests/py/ip/dup.t.payload b/tests/py/ip/dup.t.payload
index 1799b3d2f339d7502a2f3b5693ef32a08507149f..94d55c6fe2ece2d6e3f4d6faaa8c3d9a5a2b0dec 100644 (file)
--- a/tests/py/ip/dup.t.payload
+++ b/tests/py/ip/dup.t.payload
@@ -3,13 +3,13 @@ ip test-ip4 test
   [ immediate reg 1 0x0102a8c0 ]
   [ dup sreg_addr 1 ]
 
-# dup to 192.168.2.1 device eth0
+# dup to 192.168.2.1 device "eth0"
 ip test-ip4 test 
   [ immediate reg 1 0x0102a8c0 ]
   [ immediate reg 2 0x00000002 ]
   [ dup sreg_addr 1 sreg_dev 2 ]
 
-# dup to ip saddr map { 192.168.2.120 : 192.168.2.1 } device eth0
+# dup to ip saddr map { 192.168.2.120 : 192.168.2.1 } device "eth0"
 __map%d test-ip4 b
 __map%d test-ip4 0
         element 7802a8c0  : 0102a8c0 0 [end]

diff --git a/tests/py/ip/ip.t b/tests/py/ip/ip.t
index 8fa53be48f015aa1a480652c68f1a388f0f3ec93..8ed2e99ccad3f545f196a24cacb1b12788203211 100644 (file)
--- a/tests/py/ip/ip.t
+++ b/tests/py/ip/ip.t
@@ -123,11 +123,11 @@ ip hdrlength 15;ok
 ip hdrlength 16;fail
 
 # limit impact to lo
-iif lo ip daddr set 127.0.0.1;ok
-iif lo ip checksum set 0;ok
-iif lo ip id set 0;ok
-iif lo ip ecn set 1;ok;iif lo ip ecn set ect1
-iif lo ip ecn set ce;ok
-
-iif lo ip dscp set af23;ok
-iif lo ip dscp set cs0;ok
+iif "lo" ip daddr set 127.0.0.1;ok
+iif "lo" ip checksum set 0;ok
+iif "lo" ip id set 0;ok
+iif "lo" ip ecn set 1;ok;iif "lo" ip ecn set ect1
+iif "lo" ip ecn set ce;ok
+
+iif "lo" ip dscp set af23;ok
+iif "lo" ip dscp set cs0;ok

diff --git a/tests/py/ip/ip.t.payload b/tests/py/ip/ip.t.payload
index 75e85c1843b6547f8bbcf5f5ab3086ab2a335972..4c7bd7df7a1e3f3daa755bc4eb36651fcb1b2e5e 100644 (file)
--- a/tests/py/ip/ip.t.payload
+++ b/tests/py/ip/ip.t.payload
@@ -416,28 +416,28 @@ ip test-ip4 input
   [ bitwise reg 1 = (reg=1 & 0x0000000f ) ^ 0x00000000 ]
   [ cmp eq reg 1 0x0000000f ]
 
-# iif lo ip daddr set 127.0.0.1
+# iif "lo" ip daddr set 127.0.0.1
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
   [ immediate reg 1 0x0100007f ]
   [ payload write reg 1 => 4b @ network header + 16 csum_type 1 csum_off 10 ]
 
-# iif lo ip checksum set 0
+# iif "lo" ip checksum set 0
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
   [ immediate reg 1 0x00000000 ]
   [ payload write reg 1 => 2b @ network header + 10 csum_type 1 csum_off 10 ]
 
-# iif lo ip id set 0
+# iif "lo" ip id set 0
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
   [ immediate reg 1 0x00000000 ]
   [ payload write reg 1 => 2b @ network header + 4 csum_type 1 csum_off 10 ]
 
-# iif lo ip ecn set 1
+# iif "lo" ip ecn set 1
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -445,7 +445,7 @@ ip test-ip4 input
   [ bitwise reg 1 = (reg=1 & 0x0000fcff ) ^ 0x00000100 ]
   [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ]
 
-# iif lo ip ecn set ce
+# iif "lo" ip ecn set ce
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -453,7 +453,7 @@ ip test-ip4 input
   [ bitwise reg 1 = (reg=1 & 0x0000fcff ) ^ 0x00000300 ]
   [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ]
 
-# iif lo ip dscp set af23
+# iif "lo" ip dscp set af23
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -461,7 +461,7 @@ ip test-ip4 input
   [ bitwise reg 1 = (reg=1 & 0x000003ff ) ^ 0x00005800 ]
   [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ]
 
-# iif lo ip dscp set cs0
+# iif "lo" ip dscp set cs0
 ip test-ip4 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]

diff --git a/tests/py/ip/ip.t.payload.inet b/tests/py/ip/ip.t.payload.inet
index 5cdf2a60c15c4f960b7cfd18fece9e5a1fc57252..baaf7b358335efa89208b1f0fa37126f7bd9a212 100644 (file)
--- a/tests/py/ip/ip.t.payload.inet
+++ b/tests/py/ip/ip.t.payload.inet
@@ -548,7 +548,7 @@ inet test-inet input
   [ bitwise reg 1 = (reg=1 & 0x0000000f ) ^ 0x00000000 ]
   [ cmp eq reg 1 0x0000000f ]
 
-# iif lo ip daddr set 127.0.0.1
+# iif "lo" ip daddr set 127.0.0.1
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -557,7 +557,7 @@ inet test-inet input
   [ immediate reg 1 0x0100007f ]
   [ payload write reg 1 => 4b @ network header + 16 csum_type 1 csum_off 10 ]
 
-# iif lo ip checksum set 0
+# iif "lo" ip checksum set 0
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -566,7 +566,7 @@ inet test-inet input
   [ immediate reg 1 0x00000000 ]
   [ payload write reg 1 => 2b @ network header + 10 csum_type 1 csum_off 10 ]
 
-# iif lo ip id set 0
+# iif "lo" ip id set 0
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -575,7 +575,7 @@ inet test-inet input
   [ immediate reg 1 0x00000000 ]
   [ payload write reg 1 => 2b @ network header + 4 csum_type 1 csum_off 10 ]
 
-# iif lo ip ecn set 1
+# iif "lo" ip ecn set 1
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -585,7 +585,7 @@ inet test-inet input
   [ bitwise reg 1 = (reg=1 & 0x0000fcff ) ^ 0x00000100 ]
   [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ]
 
-# iif lo ip ecn set ce
+# iif "lo" ip ecn set ce
 inet test-netdev ingress
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -595,7 +595,7 @@ inet test-netdev ingress
   [ bitwise reg 1 = (reg=1 & 0x0000fcff ) ^ 0x00000300 ]
   [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ]
 
-# iif lo ip dscp set af23
+# iif "lo" ip dscp set af23
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -605,7 +605,7 @@ inet test-inet input
   [ bitwise reg 1 = (reg=1 & 0x000003ff ) ^ 0x00005800 ]
   [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ]
 
-# iif lo ip dscp set cs0
+# iif "lo" ip dscp set cs0
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]

diff --git a/tests/py/ip/ip.t.payload.netdev b/tests/py/ip/ip.t.payload.netdev
index 134fb73096f4292b522fb74abc1854be23022baf..2d8f947a445d29a43eada5603b2b8a1894ab4362 100644 (file)
--- a/tests/py/ip/ip.t.payload.netdev
+++ b/tests/py/ip/ip.t.payload.netdev
@@ -648,7 +648,7 @@ netdev test-netdev ingress
   [ bitwise reg 1 = (reg=1 & 0x000000fc ) ^ 0x00000000 ]
   [ lookup reg 1 set __set%d ]
 
-# iif lo ip daddr set 127.0.0.1
+# iif "lo" ip daddr set 127.0.0.1
 netdev test-netdev ingress
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -657,7 +657,7 @@ netdev test-netdev ingress
   [ immediate reg 1 0x0100007f ]
   [ payload write reg 1 => 4b @ network header + 16 csum_type 1 csum_off 10 ]
 
-# iif lo ip checksum set 0
+# iif "lo" ip checksum set 0
 netdev test-netdev ingress
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -666,7 +666,7 @@ netdev test-netdev ingress
   [ immediate reg 1 0x00000000 ]
   [ payload write reg 1 => 2b @ network header + 10 csum_type 1 csum_off 10 ]
 
-# iif lo ip id set 0
+# iif "lo" ip id set 0
 netdev test-netdev ingress
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -675,7 +675,7 @@ netdev test-netdev ingress
   [ immediate reg 1 0x00000000 ]
   [ payload write reg 1 => 2b @ network header + 4 csum_type 1 csum_off 10 ]
 
-# iif lo ip ecn set 1
+# iif "lo" ip ecn set 1
 netdev test-netdev ingress
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -685,7 +685,7 @@ netdev test-netdev ingress
   [ bitwise reg 1 = (reg=1 & 0x0000fcff ) ^ 0x00000100 ]
   [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ]
 
-# iif lo ip ecn set ce
+# iif "lo" ip ecn set ce
 netdev test-netdev ingress
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -695,7 +695,7 @@ netdev test-netdev ingress
   [ bitwise reg 1 = (reg=1 & 0x0000fcff ) ^ 0x00000300 ]
   [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ]
 
-# iif lo ip dscp set af23
+# iif "lo" ip dscp set af23
 netdev test-netdev ingress
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -705,7 +705,7 @@ netdev test-netdev ingress
   [ bitwise reg 1 = (reg=1 & 0x000003ff ) ^ 0x00005800 ]
   [ payload write reg 1 => 2b @ network header + 0 csum_type 1 csum_off 10 ]
 
-# iif lo ip dscp set cs0
+# iif "lo" ip dscp set cs0
 netdev test-netdev ingress
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]

diff --git a/tests/py/ip6/dup.t b/tests/py/ip6/dup.t
index e6bb78b8140d7b37caa51d64dbf3be5d6e3e40b9..f3c8c8396442bc6a789df160d4c349d11f90ccbb 100644 (file)
--- a/tests/py/ip6/dup.t
+++ b/tests/py/ip6/dup.t
@@ -3,5 +3,5 @@
 *ip6;test-ip6;input
 
 dup to abcd::1;ok
-dup to abcd::1 device eth0;ok
-dup to ip6 saddr map { abcd::1 : cafe::cafe } device eth0;ok
+dup to abcd::1 device "eth0";ok
+dup to ip6 saddr map { abcd::1 : cafe::cafe } device "eth0";ok

diff --git a/tests/py/ip6/dup.t.payload b/tests/py/ip6/dup.t.payload
index be5077801ef2567dd809825fc45c08223f987703..30015cc9c3b9b8df24490dd8338850cd7109ff81 100644 (file)
--- a/tests/py/ip6/dup.t.payload
+++ b/tests/py/ip6/dup.t.payload
@@ -3,13 +3,13 @@ ip6 test test
   [ immediate reg 1 0x0000cdab 0x00000000 0x00000000 0x01000000 ]
   [ dup sreg_addr 1 ]
 
-# dup to abcd::1 device eth0
+# dup to abcd::1 device "eth0"
 ip6 test test 
   [ immediate reg 1 0x0000cdab 0x00000000 0x00000000 0x01000000 ]
   [ immediate reg 2 0x00000002 ]
   [ dup sreg_addr 1 sreg_dev 2 ]
 
-# dup to ip6 saddr map { abcd::1 : cafe::cafe } device eth0
+# dup to ip6 saddr map { abcd::1 : cafe::cafe } device "eth0"
 __map%d test-ip6 b
 __map%d test-ip6 0
         element 0000cdab 00000000 00000000 01000000  : 0000feca 00000000 00000000 feca0000 0 [end]

diff --git a/tests/py/ip6/ip6.t b/tests/py/ip6/ip6.t
index 7dea2f756988117f7456e15870d735206768b7cb..9a18f7a4ee84c0a4387dd868ae08923db431bb6a 100644 (file)
--- a/tests/py/ip6/ip6.t
+++ b/tests/py/ip6/ip6.t
@@ -143,17 +143,17 @@ ip6 saddr ::1 ip6 daddr ::2;ok
 ip6 daddr != ::1234:1234:1234:1234:1234:1234:1234-1234:1234::1234:1234:1234:1234:1234;ok;ip6 daddr != 0:1234:1234:1234:1234:1234:1234:1234-1234:1234:0:1234:1234:1234:1234:1234
 
 # limit impact to lo
-iif lo ip6 daddr set ::1;ok
-iif lo ip6 hoplimit set 1;ok
-iif lo ip6 dscp set af42;ok
-iif lo ip6 dscp set 63;ok;iif lo ip6 dscp set 0x3f
-iif lo ip6 ecn set ect0;ok
-iif lo ip6 ecn set ce;ok
+iif "lo" ip6 daddr set ::1;ok
+iif "lo" ip6 hoplimit set 1;ok
+iif "lo" ip6 dscp set af42;ok
+iif "lo" ip6 dscp set 63;ok;iif "lo" ip6 dscp set 0x3f
+iif "lo" ip6 ecn set ect0;ok
+iif "lo" ip6 ecn set ce;ok
 
-iif lo ip6 flowlabel set 0;ok
-iif lo ip6 flowlabel set 12345;ok
-iif lo ip6 flowlabel set 0xfffff;ok;iif lo ip6 flowlabel set 1048575
+iif "lo" ip6 flowlabel set 0;ok
+iif "lo" ip6 flowlabel set 12345;ok
+iif "lo" ip6 flowlabel set 0xfffff;ok;iif "lo" ip6 flowlabel set 1048575
 
-iif lo ip6 ecn set 4;fail
-iif lo ip6 dscp set 64;fail
-iif lo ip6 flowlabel set 1048576;fail
+iif "lo" ip6 ecn set 4;fail
+iif "lo" ip6 dscp set 64;fail
+iif "lo" ip6 flowlabel set 1048576;fail

diff --git a/tests/py/ip6/ip6.t.payload.inet b/tests/py/ip6/ip6.t.payload.inet
index bf21b5babe565839b44051fe413b9bf9c71e8156..f9512154d45dede8036c521068c1c9e2e9bd316f 100644 (file)
--- a/tests/py/ip6/ip6.t.payload.inet
+++ b/tests/py/ip6/ip6.t.payload.inet
@@ -513,7 +513,7 @@ inet test-inet input
   [ cmp lt reg 1 0x34120000 0x34123412 0x34123412 0x34123412 ]
   [ cmp gt reg 1 0x34123412 0x34120000 0x34123412 0x34123412 ]
 
-# iif lo ip6 daddr set ::1
+# iif "lo" ip6 daddr set ::1
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -522,7 +522,7 @@ inet test-inet input
   [ immediate reg 1 0x00000000 0x00000000 0x00000000 0x01000000 ]
   [ payload write reg 1 => 16b @ network header + 24 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 hoplimit set 1
+# iif "lo" ip6 hoplimit set 1
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -531,7 +531,7 @@ inet test-inet input
   [ immediate reg 1 0x00000001 ]
   [ payload write reg 1 => 1b @ network header + 7 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 dscp set af42
+# iif "lo" ip6 dscp set af42
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -541,7 +541,7 @@ inet test-inet input
   [ bitwise reg 1 = (reg=1 & 0x00003ff0 ) ^ 0x00000009 ]
   [ payload write reg 1 => 2b @ network header + 0 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 dscp set 63
+# iif "lo" ip6 dscp set 63
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -551,7 +551,7 @@ inet test-inet input
   [ bitwise reg 1 = (reg=1 & 0x00003ff0 ) ^ 0x0000c00f ]
   [ payload write reg 1 => 2b @ network header + 0 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 ecn set ect0
+# iif "lo" ip6 ecn set ect0
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -561,7 +561,7 @@ inet test-inet input
   [ bitwise reg 1 = (reg=1 & 0x000000cf ) ^ 0x00000020 ]
   [ payload write reg 1 => 1b @ network header + 1 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 ecn set ce
+# iif "lo" ip6 ecn set ce
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -571,7 +571,7 @@ inet test-inet input
   [ bitwise reg 1 = (reg=1 & 0x000000cf ) ^ 0x00000030 ]
   [ payload write reg 1 => 1b @ network header + 1 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 flowlabel set 0
+# iif "lo" ip6 flowlabel set 0
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -581,7 +581,7 @@ inet test-inet input
   [ bitwise reg 1 = (reg=1 & 0x000000f0 ) ^ 0x00000000 ]
   [ payload write reg 1 => 3b @ network header + 1 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 flowlabel set 12345
+# iif "lo" ip6 flowlabel set 12345
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -591,7 +591,7 @@ inet test-inet input
   [ bitwise reg 1 = (reg=1 & 0x000000f0 ) ^ 0x00393000 ]
   [ payload write reg 1 => 3b @ network header + 1 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 flowlabel set 0xfffff
+# iif "lo" ip6 flowlabel set 0xfffff
 inet test-inet input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]

diff --git a/tests/py/ip6/ip6.t.payload.ip6 b/tests/py/ip6/ip6.t.payload.ip6
index 70d2ea061ea924b03e461b5e61c01e78c080e346..422fabdb6d6c7a6c71811beae59ba7c87752503d 100644 (file)
--- a/tests/py/ip6/ip6.t.payload.ip6
+++ b/tests/py/ip6/ip6.t.payload.ip6
@@ -379,21 +379,21 @@ ip6 test-ip6 input
   [ cmp lt reg 1 0x34120000 0x34123412 0x34123412 0x34123412 ]
   [ cmp gt reg 1 0x34123412 0x34120000 0x34123412 0x34123412 ]
 
-# iif lo ip6 daddr set ::1
+# iif "lo" ip6 daddr set ::1
 ip6 test-ip6 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
   [ immediate reg 1 0x00000000 0x00000000 0x00000000 0x01000000 ]
   [ payload write reg 1 => 16b @ network header + 24 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 hoplimit set 1
+# iif "lo" ip6 hoplimit set 1
 ip6 test-ip6 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
   [ immediate reg 1 0x00000001 ]
   [ payload write reg 1 => 1b @ network header + 7 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 dscp set af42
+# iif "lo" ip6 dscp set af42
 ip6 test-ip6 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -401,7 +401,7 @@ ip6 test-ip6 input
   [ bitwise reg 1 = (reg=1 & 0x00003ff0 ) ^ 0x00000009 ]
   [ payload write reg 1 => 2b @ network header + 0 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 dscp set 63
+# iif "lo" ip6 dscp set 63
 ip6 test-ip6 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -409,7 +409,7 @@ ip6 test-ip6 input
   [ bitwise reg 1 = (reg=1 & 0x00003ff0 ) ^ 0x0000c00f ]
   [ payload write reg 1 => 2b @ network header + 0 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 ecn set ect0
+# iif "lo" ip6 ecn set ect0
 ip6 test-ip6 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -417,7 +417,7 @@ ip6 test-ip6 input
   [ bitwise reg 1 = (reg=1 & 0x000000cf ) ^ 0x00000020 ]
   [ payload write reg 1 => 1b @ network header + 1 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 ecn set ce
+# iif "lo" ip6 ecn set ce
 ip6 test-ip6 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -425,7 +425,7 @@ ip6 test-ip6 input
   [ bitwise reg 1 = (reg=1 & 0x000000cf ) ^ 0x00000030 ]
   [ payload write reg 1 => 1b @ network header + 1 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 flowlabel set 0
+# iif "lo" ip6 flowlabel set 0
 ip6 test-ip6 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -433,7 +433,7 @@ ip6 test-ip6 input
   [ bitwise reg 1 = (reg=1 & 0x000000f0 ) ^ 0x00000000 ]
   [ payload write reg 1 => 3b @ network header + 1 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 flowlabel set 12345
+# iif "lo" ip6 flowlabel set 12345
 ip6 test-ip6 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
@@ -441,7 +441,7 @@ ip6 test-ip6 input
   [ bitwise reg 1 = (reg=1 & 0x000000f0 ) ^ 0x00393000 ]
   [ payload write reg 1 => 3b @ network header + 1 csum_type 0 csum_off 0 ]
 
-# iif lo ip6 flowlabel set 0xfffff
+# iif "lo" ip6 flowlabel set 0xfffff
 ip6 test-ip6 input
   [ meta load iif => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]