tests: shell: Convert dumps to numeric protocols

These changes were caused by a test run with DUMPGEN=y.

Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/tests/shell/testcases/cache/dumps/0003_cache_update_0.json-nft b/tests/shell/testcases/cache/dumps/0003_cache_update_0.json-nft
index e09a694c2df7bd94613e56fe1c7217f26d91fb5a..c6be696c50cdaf771f74d6baa14167be20485599 100644 (file)
--- a/tests/shell/testcases/cache/dumps/0003_cache_update_0.json-nft
+++ b/tests/shell/testcases/cache/dumps/0003_cache_update_0.json-nft
@@ -74,7 +74,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "icmp"
+              "right": 1
             }
           },
           {
@@ -111,7 +111,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "igmp"
+              "right": 2
             }
           },
           {

diff --git a/tests/shell/testcases/cache/dumps/0003_cache_update_0.nft b/tests/shell/testcases/cache/dumps/0003_cache_update_0.nft
index 43898d336d02aed2b4e7a116da8fd1ff2133e52d..da9076f2ee835ef7770bd86d21aaeef14df4581b 100644 (file)
--- a/tests/shell/testcases/cache/dumps/0003_cache_update_0.nft
+++ b/tests/shell/testcases/cache/dumps/0003_cache_update_0.nft
@@ -10,9 +10,9 @@ table ip t3 {
 }
 table ip t4 {
        chain c {
-               meta l4proto icmp accept
+               meta l4proto 1 accept
                drop
-               meta l4proto igmp accept
+               meta l4proto 2 accept
                drop
        }
 }

diff --git a/tests/shell/testcases/chains/dumps/0041chain_binding_0.nft b/tests/shell/testcases/chains/dumps/0041chain_binding_0.nft
index 520203d89ca154bacf4583087b0521940894f4d2..28be854f918879beeb89fe967b01758fde4393ba 100644 (file)
--- a/tests/shell/testcases/chains/dumps/0041chain_binding_0.nft
+++ b/tests/shell/testcases/chains/dumps/0041chain_binding_0.nft
@@ -1,11 +1,11 @@
 table inet x {
        chain y {
                type filter hook input priority filter; policy accept;
-               meta l4proto { tcp, udp } th dport 53 jump {
+               meta l4proto { 6, 17 } th dport 53 jump {
                        ip saddr { 127.0.0.0/8, 172.23.0.0/16, 192.168.13.0/24 } counter packets 0 bytes 0 accept
                        ip6 saddr ::1 counter packets 0 bytes 0 accept
                }
-               meta l4proto ipv6-icmp jump {
+               meta l4proto 58 jump {
                        counter packets 0 bytes 0 accept
                }
        }

diff --git a/tests/shell/testcases/maps/dumps/0010concat_map_0.json-nft b/tests/shell/testcases/maps/dumps/0010concat_map_0.json-nft
index fcc23bb8095fafc14dafe8dbc3a6bcdd53500ce7..0ac62525d365475b0fe982d624f1ac04236ee00d 100644 (file)
--- a/tests/shell/testcases/maps/dumps/0010concat_map_0.json-nft
+++ b/tests/shell/testcases/maps/dumps/0010concat_map_0.json-nft
@@ -46,7 +46,7 @@
             {
               "concat": [
                 "1.1.1.1",
-                "tcp",
+                6,
                 20
               ]
             },

diff --git a/tests/shell/testcases/maps/dumps/0010concat_map_0.nft b/tests/shell/testcases/maps/dumps/0010concat_map_0.nft
index 2f796b51d46b784bb1ac12b67f87be9266b35398..c21b3ea0c1a2ff2d579e6138e2bca28ffda19fed 100644 (file)
--- a/tests/shell/testcases/maps/dumps/0010concat_map_0.nft
+++ b/tests/shell/testcases/maps/dumps/0010concat_map_0.nft
@@ -1,7 +1,7 @@
 table inet x {
        map z {
                type ipv4_addr . inet_proto . inet_service : ipv4_addr . inet_service
-               elements = { 1.1.1.1 . tcp . 20 : 2.2.2.2 . 30 }
+               elements = { 1.1.1.1 . 6 . 20 : 2.2.2.2 . 30 }
        }
 
        chain y {

diff --git a/tests/shell/testcases/maps/dumps/0013map_0.json-nft b/tests/shell/testcases/maps/dumps/0013map_0.json-nft
index e91a269d8e6e669f19698cc6574928dcb71341bf..81371962558e9b7cb2e8540181285d699a81d63e 100644 (file)
--- a/tests/shell/testcases/maps/dumps/0013map_0.json-nft
+++ b/tests/shell/testcases/maps/dumps/0013map_0.json-nft
@@ -48,7 +48,7 @@
                 "val": {
                   "concat": [
                     "10.133.89.138",
-                    "tcp",
+                    6,
                     8081
                   ]
                 },

diff --git a/tests/shell/testcases/maps/dumps/0013map_0.nft b/tests/shell/testcases/maps/dumps/0013map_0.nft
index 1455877df1bff10f15b5c381b848286b0eccfbce..ad09ed64fd3f19f5f7df278a410032ec99d2ad33 100644 (file)
--- a/tests/shell/testcases/maps/dumps/0013map_0.nft
+++ b/tests/shell/testcases/maps/dumps/0013map_0.nft
@@ -3,7 +3,7 @@ table ip filter {
                type ipv4_addr . inet_proto . inet_service : verdict
                flags interval
                counter
-               elements = { 10.133.89.138 . tcp . 8081 counter packets 0 bytes 0 : accept }
+               elements = { 10.133.89.138 . 6 . 8081 counter packets 0 bytes 0 : accept }
        }
 
        chain FORWARD {

diff --git a/tests/shell/testcases/maps/dumps/anon_objmap_concat.json-nft b/tests/shell/testcases/maps/dumps/anon_objmap_concat.json-nft
index 642098427e6f9340cc66a8bebbd285d712496b82..dc90419a701d1e1bacbc6405ea3ed1a77c1cd397 100644 (file)
--- a/tests/shell/testcases/maps/dumps/anon_objmap_concat.json-nft
+++ b/tests/shell/testcases/maps/dumps/anon_objmap_concat.json-nft
@@ -79,7 +79,7 @@
                     [
                       {
                         "concat": [
-                          "udp",
+                          17,
                           {
                             "range": [
                               10000,
@@ -93,7 +93,7 @@
                     [
                       {
                         "concat": [
-                          "tcp",
+                          6,
                           {
                             "range": [
                               10000,

diff --git a/tests/shell/testcases/maps/dumps/anon_objmap_concat.nft b/tests/shell/testcases/maps/dumps/anon_objmap_concat.nft
index 23aca0a2d9886d1554130a34afa0adfb6357eabe..eef4e9f04ad91cdbe1dc2502c440a339b54e3839 100644 (file)
--- a/tests/shell/testcases/maps/dumps/anon_objmap_concat.nft
+++ b/tests/shell/testcases/maps/dumps/anon_objmap_concat.nft
@@ -11,6 +11,6 @@ table inet filter {
 
        chain input {
                type filter hook input priority filter; policy accept;
-               ct helper set ip protocol . th dport map { udp . 10000-20000 : "sip-5060u", tcp . 10000-20000 : "sip-5060t" }
+               ct helper set ip protocol . th dport map { 17 . 10000-20000 : "sip-5060u", 6 . 10000-20000 : "sip-5060t" }
        }
 }

diff --git a/tests/shell/testcases/maps/dumps/named_limits.json-nft b/tests/shell/testcases/maps/dumps/named_limits.json-nft
index 3c6845ac43b421cfe270a2684d420444f4a1abac..ffbeee1289487da20516666ecef3f86aace53c4c 100644 (file)
--- a/tests/shell/testcases/maps/dumps/named_limits.json-nft
+++ b/tests/shell/testcases/maps/dumps/named_limits.json-nft
@@ -151,7 +151,7 @@
           [
             {
               "concat": [
-                "tcp",
+                6,
                 {
                   "prefix": {
                     "addr": "192.168.0.0",
@@ -171,7 +171,7 @@
           [
             {
               "concat": [
-                "udp",
+                17,
                 {
                   "prefix": {
                     "addr": "192.168.0.0",
@@ -191,7 +191,7 @@
           [
             {
               "concat": [
-                "tcp",
+                6,
                 {
                   "range": [
                     "127.0.0.1",
@@ -211,7 +211,7 @@
           [
             {
               "concat": [
-                "tcp",
+                6,
                 {
                   "range": [
                     "10.0.0.1",
@@ -226,7 +226,7 @@
           [
             {
               "concat": [
-                "tcp",
+                6,
                 {
                   "range": [
                     "10.0.0.1",
@@ -241,7 +241,7 @@
           [
             {
               "concat": [
-                "tcp",
+                6,
                 {
                   "prefix": {
                     "addr": "10.0.1.0",
@@ -261,7 +261,7 @@
           [
             {
               "concat": [
-                "tcp",
+                6,
                 "10.0.2.1",
                 22
               ]

diff --git a/tests/shell/testcases/maps/dumps/named_limits.nft b/tests/shell/testcases/maps/dumps/named_limits.nft
index 214df204b770af34cce1fc8f3257e75f3533af26..29f9dc69f921bfff271cf45a95d63e706ecb3f28 100644 (file)
--- a/tests/shell/testcases/maps/dumps/named_limits.nft
+++ b/tests/shell/testcases/maps/dumps/named_limits.nft
@@ -32,13 +32,13 @@ table inet filter {
        map addr4limit {
                typeof meta l4proto . ip saddr . tcp sport : limit
                flags interval
-               elements = { tcp . 192.168.0.0/16 . 1-65535 : "tarpit-bps",
-                            udp . 192.168.0.0/16 . 1-65535 : "tarpit-pps",
-                            tcp . 127.0.0.1-127.1.2.3 . 1-1024 : "tarpit-pps",
-                            tcp . 10.0.0.1-10.0.0.255 . 80 : "http-bulk-rl-1m",
-                            tcp . 10.0.0.1-10.0.0.255 . 443 : "http-bulk-rl-1m",
-                            tcp . 10.0.1.0/24 . 1024-65535 : "http-bulk-rl-10m",
-                            tcp . 10.0.2.1 . 22 : "http-bulk-rl-10m" }
+               elements = { 6 . 192.168.0.0/16 . 1-65535 : "tarpit-bps",
+                            17 . 192.168.0.0/16 . 1-65535 : "tarpit-pps",
+                            6 . 127.0.0.1-127.1.2.3 . 1-1024 : "tarpit-pps",
+                            6 . 10.0.0.1-10.0.0.255 . 80 : "http-bulk-rl-1m",
+                            6 . 10.0.0.1-10.0.0.255 . 443 : "http-bulk-rl-1m",
+                            6 . 10.0.1.0/24 . 1024-65535 : "http-bulk-rl-10m",
+                            6 . 10.0.2.1 . 22 : "http-bulk-rl-10m" }
        }
 
        map saddr6limit {

diff --git a/tests/shell/testcases/maps/dumps/nat_addr_port.json-nft b/tests/shell/testcases/maps/dumps/nat_addr_port.json-nft
index 38b01e694180d03e560760981fe551fc8622c637..1a3e71d72e022d2a0e3d8b327409dec9e5b16fb1 100644 (file)
--- a/tests/shell/testcases/maps/dumps/nat_addr_port.json-nft
+++ b/tests/shell/testcases/maps/dumps/nat_addr_port.json-nft
@@ -262,7 +262,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -361,7 +361,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -612,7 +612,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -711,7 +711,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -1059,7 +1059,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -1159,7 +1159,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -1292,7 +1292,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -1392,7 +1392,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {

diff --git a/tests/shell/testcases/maps/dumps/nat_addr_port.nft b/tests/shell/testcases/maps/dumps/nat_addr_port.nft
index c8493b3adbf26943a39b73bac74b134b6df49df6..b8b22c717e676a9b1cf24c05bbf1955ffb672cbf 100644 (file)
--- a/tests/shell/testcases/maps/dumps/nat_addr_port.nft
+++ b/tests/shell/testcases/maps/dumps/nat_addr_port.nft
@@ -27,10 +27,10 @@ table ip ipfoo {
                dnat to ip daddr map @x
                ip saddr 10.1.1.1 dnat to 10.2.3.4
                ip saddr 10.1.1.2 tcp dport 42 dnat to 10.2.3.4:4242
-               meta l4proto tcp dnat ip to ip saddr map @y
+               meta l4proto 6 dnat ip to ip saddr map @y
                dnat ip to ip saddr . tcp dport map @z
                dnat to numgen inc mod 2 map @t1
-               meta l4proto tcp dnat ip to numgen inc mod 2 map @t2
+               meta l4proto 6 dnat ip to numgen inc mod 2 map @t2
        }
 }
 table ip6 ip6foo {
@@ -60,10 +60,10 @@ table ip6 ip6foo {
                dnat to ip6 daddr map @x
                ip6 saddr dead::1 dnat to feed::1
                ip6 saddr dead::2 tcp dport 42 dnat to [c0::1a]:4242
-               meta l4proto tcp dnat ip6 to ip6 saddr map @y
+               meta l4proto 6 dnat ip6 to ip6 saddr map @y
                dnat ip6 to ip6 saddr . tcp dport map @z
                dnat to numgen inc mod 2 map @t1
-               meta l4proto tcp dnat ip6 to numgen inc mod 2 map @t2
+               meta l4proto 6 dnat ip6 to numgen inc mod 2 map @t2
        }
 }
 table inet inetfoo {
@@ -114,16 +114,16 @@ table inet inetfoo {
                dnat ip to ip daddr map @x4
                ip saddr 10.1.1.1 dnat ip to 10.2.3.4
                ip saddr 10.1.1.2 tcp dport 42 dnat ip to 10.2.3.4:4242
-               meta l4proto tcp dnat ip to ip saddr map @y4
+               meta l4proto 6 dnat ip to ip saddr map @y4
                dnat ip to ip saddr . tcp dport map @z4
                dnat ip to numgen inc mod 2 map @t1v4
-               meta l4proto tcp dnat ip to numgen inc mod 2 map @t2v4
+               meta l4proto 6 dnat ip to numgen inc mod 2 map @t2v4
                dnat ip6 to ip6 daddr map @x6
                ip6 saddr dead::1 dnat ip6 to feed::1
                ip6 saddr dead::2 tcp dport 42 dnat ip6 to [c0::1a]:4242
-               meta l4proto tcp dnat ip6 to ip6 saddr map @y6
+               meta l4proto 6 dnat ip6 to ip6 saddr map @y6
                dnat ip6 to ip6 saddr . tcp dport map @z6
                dnat ip6 to numgen inc mod 2 map @t1v6
-               meta l4proto tcp dnat ip6 to numgen inc mod 2 map @t2v6
+               meta l4proto 6 dnat ip6 to numgen inc mod 2 map @t2v6
        }
 }

diff --git a/tests/shell/testcases/maps/dumps/typeof_maps_0.json-nft b/tests/shell/testcases/maps/dumps/typeof_maps_0.json-nft
index bef3b3d12037aadc2dcba27e8cfd9dc92e77a5a8..b7b20e392ca76e02c3e100651c4399308ef6376f 100644 (file)
--- a/tests/shell/testcases/maps/dumps/typeof_maps_0.json-nft
+++ b/tests/shell/testcases/maps/dumps/typeof_maps_0.json-nft
@@ -153,7 +153,7 @@
             {
               "concat": [
                 "eth0",
-                "tcp",
+                6,
                 22
               ]
             },
@@ -375,7 +375,7 @@
                     {
                       "concat": [
                         "eth0",
-                        "tcp",
+                        6,
                         22
                       ]
                     },
@@ -387,7 +387,7 @@
                     {
                       "concat": [
                         "eth1",
-                        "udp",
+                        17,
                         67
                       ]
                     },

diff --git a/tests/shell/testcases/maps/dumps/typeof_maps_0.nft b/tests/shell/testcases/maps/dumps/typeof_maps_0.nft
index e0efabab3b5509516cebaeb4b2ea5d6625d54b31..b6435f9bb5cf831be5e6825d0de8e72838cbaa51 100644 (file)
--- a/tests/shell/testcases/maps/dumps/typeof_maps_0.nft
+++ b/tests/shell/testcases/maps/dumps/typeof_maps_0.nft
@@ -18,7 +18,7 @@ table inet t {
 
        map m4 {
                typeof iifname . ip protocol . th dport : verdict
-               elements = { "eth0" . tcp . 22 : accept }
+               elements = { "eth0" . 6 . 22 : accept }
        }
 
        map m5 {
@@ -31,7 +31,7 @@ table inet t {
                meta mark set vlan id map @m2
                meta mark set ip saddr . ip daddr map @m3
                iifname . ip protocol . th dport vmap @m4
-               iifname . ip protocol . th dport vmap { "eth0" . tcp . 22 : accept, "eth1" . udp . 67 : drop }
+               iifname . ip protocol . th dport vmap { "eth0" . 6 . 22 : accept, "eth1" . 17 . 67 : drop }
                ipsec in reqid . iifname vmap @m5
        }
 }

diff --git a/tests/shell/testcases/maps/dumps/typeof_maps_add_delete.json-nft b/tests/shell/testcases/maps/dumps/typeof_maps_add_delete.json-nft
index effe02dcf8364e3956874329dc312ecb763cf709..08c10819f1b9c71d88e3e9ffb497f7b0131e0218 100644 (file)
--- a/tests/shell/testcases/maps/dumps/typeof_maps_add_delete.json-nft
+++ b/tests/shell/testcases/maps/dumps/typeof_maps_add_delete.json-nft
@@ -263,7 +263,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "icmp"
+              "right": 1
             }
           },
           {

diff --git a/tests/shell/testcases/maps/dumps/typeof_maps_add_delete.nft b/tests/shell/testcases/maps/dumps/typeof_maps_add_delete.nft
index e80366b8bf2a4387d8959059fc0cf08c1ba32413..3f3ef17dd5493ccc9d362b632b3b70a1bb33865e 100644 (file)
--- a/tests/shell/testcases/maps/dumps/typeof_maps_add_delete.nft
+++ b/tests/shell/testcases/maps/dumps/typeof_maps_add_delete.nft
@@ -17,6 +17,6 @@ table ip dynset {
        chain input {
                type filter hook input priority filter; policy accept;
                add @dynmark { 10.2.3.4 timeout 2s : 0x00000002 } comment "also check timeout-gc"
-               meta l4proto icmp ip daddr 127.0.0.42 jump test_ping
+               meta l4proto 1 ip daddr 127.0.0.42 jump test_ping
        }
 }

diff --git a/tests/shell/testcases/nft-f/dumps/0012different_defines_0.json-nft b/tests/shell/testcases/nft-f/dumps/0012different_defines_0.json-nft
index e266bf4c8a6982e06361cb7c5257678e7f9c9c8c..ea102f2073e1a271a02edfe7f4644bccf6793245 100644 (file)
--- a/tests/shell/testcases/nft-f/dumps/0012different_defines_0.json-nft
+++ b/tests/shell/testcases/nft-f/dumps/0012different_defines_0.json-nft
@@ -362,13 +362,13 @@
                   {
                     "concat": [
                       "fe0::1",
-                      "udp"
+                      17
                     ]
                   },
                   {
                     "concat": [
                       "fe0::2",
-                      "tcp"
+                      6
                     ]
                   }
                 ]

diff --git a/tests/shell/testcases/nft-f/dumps/0012different_defines_0.nft b/tests/shell/testcases/nft-f/dumps/0012different_defines_0.nft
index a6e16e7dd0336f1260c9c7dab601d91e35128778..d9c3834afce18b30880bb6fba2e4a3562de16bb4 100644 (file)
--- a/tests/shell/testcases/nft-f/dumps/0012different_defines_0.nft
+++ b/tests/shell/testcases/nft-f/dumps/0012different_defines_0.nft
@@ -8,7 +8,7 @@ table inet t {
                ip6 daddr fe0::1 ip6 saddr fe0::2
                ip saddr vmap { 10.0.0.0 : drop, 10.0.0.2 : accept }
                ip6 daddr vmap { fe0::1 : drop, fe0::2 : accept }
-               ip6 saddr . ip6 nexthdr { fe0::1 . udp, fe0::2 . tcp }
+               ip6 saddr . ip6 nexthdr { fe0::1 . 17, fe0::2 . 6 }
                ip daddr . iif vmap { 10.0.0.0 . "lo" : accept }
                tcp dport 100-222
                udp dport vmap { 100-222 : accept }

diff --git a/tests/shell/testcases/nft-f/dumps/named_set_as_protocol_dep.json-nft b/tests/shell/testcases/nft-f/dumps/named_set_as_protocol_dep.json-nft
index 4bc24aa319aba77a3192ebd4a35831a363bdd7d4..c17b8b2168175239273f20bf2f96931150652bae 100644 (file)
--- a/tests/shell/testcases/nft-f/dumps/named_set_as_protocol_dep.json-nft
+++ b/tests/shell/testcases/nft-f/dumps/named_set_as_protocol_dep.json-nft
@@ -40,8 +40,8 @@
         },
         "handle": 0,
         "elem": [
-          "tcp",
-          "udp"
+          6,
+          17
         ]
       }
     },

diff --git a/tests/shell/testcases/nft-f/dumps/named_set_as_protocol_dep.nft b/tests/shell/testcases/nft-f/dumps/named_set_as_protocol_dep.nft
index 2bc0c2adb38c8f429259790cdea174b457d593b7..c0ad40110d980ddc9176a7b9cf3d2f713317a086 100644 (file)
--- a/tests/shell/testcases/nft-f/dumps/named_set_as_protocol_dep.nft
+++ b/tests/shell/testcases/nft-f/dumps/named_set_as_protocol_dep.nft
@@ -1,7 +1,7 @@
 table inet test {
        set protos {
                typeof meta l4proto
-               elements = { tcp, udp }
+               elements = { 6, 17 }
        }
 
        chain prerouting {

diff --git a/tests/shell/testcases/nft-f/dumps/sample-ruleset.nft b/tests/shell/testcases/nft-f/dumps/sample-ruleset.nft
index 1a9f4e7a4afa4b4921ce4f47f1fcecd33b5c53d3..7bcd6d4c9223a59370f420ec37d9b5d7dd21fd18 100644 (file)
--- a/tests/shell/testcases/nft-f/dumps/sample-ruleset.nft
+++ b/tests/shell/testcases/nft-f/dumps/sample-ruleset.nft
@@ -49,7 +49,7 @@ table inet filter {
 
        chain PREROUTING_RAW {
                type filter hook prerouting priority raw; policy accept;
-               meta l4proto != { icmp, tcp, udp, ipv6-icmp } counter packets 0 bytes 0 drop
+               meta l4proto != { 1, 6, 17, 58 } counter packets 0 bytes 0 drop
                tcp flags syn jump {
                        tcp option maxseg size 1-500 counter packets 0 bytes 0 drop
                        tcp sport 0 counter packets 0 bytes 0 drop
@@ -119,7 +119,7 @@ table inet filter {
                icmp type echo-request accept
                icmpv6 type echo-request accept
                tcp dport 22 iifname "eth1" accept
-               meta l4proto { tcp, udp } th dport 53 jump {
+               meta l4proto { 6, 17 } th dport 53 jump {
                        ip6 saddr != { fd00::/8, fe80::/64 } counter packets 0 bytes 0 reject with icmpv6 port-unreachable
                        accept
                }

diff --git a/tests/shell/testcases/optimizations/dumps/merge_reject.json-nft b/tests/shell/testcases/optimizations/dumps/merge_reject.json-nft
index 8f468e019657cfa36a148da3682f664c85035021..cdda63085eb320b660e85a709b8231fa6af38391 100644 (file)
--- a/tests/shell/testcases/optimizations/dumps/merge_reject.json-nft
+++ b/tests/shell/testcases/optimizations/dumps/merge_reject.json-nft
@@ -100,21 +100,21 @@
                 "set": [
                   {
                     "concat": [
-                      "tcp",
+                      6,
                       "172.30.33.71",
                       3306
                     ]
                   },
                   {
                     "concat": [
-                      "tcp",
+                      6,
                       "172.30.238.117",
                       8080
                     ]
                   },
                   {
                     "concat": [
-                      "tcp",
+                      6,
                       "172.30.254.251",
                       3306
                     ]
@@ -233,21 +233,21 @@
                 "set": [
                   {
                     "concat": [
-                      "tcp",
+                      6,
                       "aaaa::2",
                       3306
                     ]
                   },
                   {
                     "concat": [
-                      "tcp",
+                      6,
                       "aaaa::3",
                       8080
                     ]
                   },
                   {
                     "concat": [
-                      "tcp",
+                      6,
                       "aaaa::4",
                       3306
                     ]

diff --git a/tests/shell/testcases/optimizations/dumps/merge_reject.nft b/tests/shell/testcases/optimizations/dumps/merge_reject.nft
index 1727d024866d7fbd2bf54e2e9b86571fa9368cb5..1091f3739bd70918c63380b86b37f3a0ce02d757 100644 (file)
--- a/tests/shell/testcases/optimizations/dumps/merge_reject.nft
+++ b/tests/shell/testcases/optimizations/dumps/merge_reject.nft
@@ -1,13 +1,13 @@
 table ip x {
        chain y {
                ip daddr 172.30.33.70 tcp dport 3306 counter packets 0 bytes 0 drop
-               meta l4proto . ip daddr . tcp dport { tcp . 172.30.33.71 . 3306, tcp . 172.30.238.117 . 8080, tcp . 172.30.254.251 . 3306 } counter packets 0 bytes 0 reject
+               meta l4proto . ip daddr . tcp dport { 6 . 172.30.33.71 . 3306, 6 . 172.30.238.117 . 8080, 6 . 172.30.254.251 . 3306 } counter packets 0 bytes 0 reject
                ip daddr 172.30.254.252 tcp dport 3306 counter packets 0 bytes 0 reject with tcp reset
        }
 }
 table ip6 x {
        chain y {
-               meta l4proto . ip6 daddr . tcp dport { tcp . aaaa::2 . 3306, tcp . aaaa::3 . 8080, tcp . aaaa::4 . 3306 } counter packets 0 bytes 0 reject
+               meta l4proto . ip6 daddr . tcp dport { 6 . aaaa::2 . 3306, 6 . aaaa::3 . 8080, 6 . aaaa::4 . 3306 } counter packets 0 bytes 0 reject
                ip6 daddr aaaa::5 tcp dport 3306 counter packets 0 bytes 0 reject with tcp reset
        }
 }

diff --git a/tests/shell/testcases/optimizations/dumps/merge_stmts_concat.json-nft b/tests/shell/testcases/optimizations/dumps/merge_stmts_concat.json-nft
index b70ee97b35ebd40385a5915f244684260af317e1..61274b40300f5e66945ec15d1b36f3ffa158fa50 100644 (file)
--- a/tests/shell/testcases/optimizations/dumps/merge_stmts_concat.json-nft
+++ b/tests/shell/testcases/optimizations/dumps/merge_stmts_concat.json-nft
@@ -164,13 +164,13 @@
                 "set": [
                   {
                     "concat": [
-                      "tcp",
+                      6,
                       22
                     ]
                   },
                   {
                     "concat": [
-                      "udp",
+                      17,
                       67
                     ]
                   }

diff --git a/tests/shell/testcases/optimizations/dumps/merge_stmts_concat.nft b/tests/shell/testcases/optimizations/dumps/merge_stmts_concat.nft
index 6150258512061d06d5b4cac203b8e05f94063935..64fab14572d0d27df34b4f4615984a41b744fcc5 100644 (file)
--- a/tests/shell/testcases/optimizations/dumps/merge_stmts_concat.nft
+++ b/tests/shell/testcases/optimizations/dumps/merge_stmts_concat.nft
@@ -1,7 +1,7 @@
 table ip x {
        chain y {
                iifname . ip saddr . ip daddr { "eth1" . 1.1.1.1 . 2.2.2.3, "eth1" . 1.1.1.2 . 2.2.2.4, "eth1" . 1.1.1.2 . 2.2.3.0/24, "eth1" . 1.1.1.2 . 2.2.4.0-2.2.4.10, "eth2" . 1.1.1.3 . 2.2.2.5 } accept
-               ip protocol . th dport { tcp . 22, udp . 67 }
+               ip protocol . th dport { 6 . 22, 17 . 67 }
                udp dport . ct state { 137 . new, 137 . untracked, 138 . new, 138 . untracked } accept
        }
 

diff --git a/tests/shell/testcases/optimizations/dumps/merge_vmap_raw.json-nft b/tests/shell/testcases/optimizations/dumps/merge_vmap_raw.json-nft
index b8ad126cd296182bed9ef4d2565fdb97ad979ced..5b385ffd2e101203f9f4e84d076c8864906292dc 100644 (file)
--- a/tests/shell/testcases/optimizations/dumps/merge_vmap_raw.json-nft
+++ b/tests/shell/testcases/optimizations/dumps/merge_vmap_raw.json-nft
@@ -77,7 +77,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "udp"
+              "right": 17
             }
           },
           {
@@ -116,7 +116,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "udp"
+              "right": 17
             }
           },
           {
@@ -166,7 +166,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "udp"
+              "right": 17
             }
           },
           {
@@ -218,7 +218,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "udp"
+              "right": 17
             }
           },
           {
@@ -270,7 +270,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "udp"
+              "right": 17
             }
           },
           {

diff --git a/tests/shell/testcases/optimizations/dumps/merge_vmap_raw.nft b/tests/shell/testcases/optimizations/dumps/merge_vmap_raw.nft
index 18847116eb5031e748b4f04800a90495c3389ca7..5b9799ae9cb7fd8fc1644b5343e823e518182a30 100644 (file)
--- a/tests/shell/testcases/optimizations/dumps/merge_vmap_raw.nft
+++ b/tests/shell/testcases/optimizations/dumps/merge_vmap_raw.nft
@@ -1,26 +1,26 @@
 table inet x {
        chain nat_dns_dnstc {
-               meta l4proto udp redirect to :5300
+               meta l4proto 17 redirect to :5300
                drop
        }
 
        chain nat_dns_this_5301 {
-               meta l4proto udp redirect to :5301
+               meta l4proto 17 redirect to :5301
                drop
        }
 
        chain nat_dns_saturn_5301 {
-               meta nfproto ipv4 meta l4proto udp dnat ip to 240.0.1.2:5301
+               meta nfproto ipv4 meta l4proto 17 dnat ip to 240.0.1.2:5301
                drop
        }
 
        chain nat_dns_saturn_5302 {
-               meta nfproto ipv4 meta l4proto udp dnat ip to 240.0.1.2:5302
+               meta nfproto ipv4 meta l4proto 17 dnat ip to 240.0.1.2:5302
                drop
        }
 
        chain nat_dns_saturn_5303 {
-               meta nfproto ipv4 meta l4proto udp dnat ip to 240.0.1.2:5303
+               meta nfproto ipv4 meta l4proto 17 dnat ip to 240.0.1.2:5303
                drop
        }
 

diff --git a/tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft b/tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft
index e87f1c4c082eb3423b9dac11957904f967b3cafa..acba97cca3cbdd2a6ca927b74f0ff65b38fba373 100644 (file)
--- a/tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft
+++ b/tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft
@@ -166,7 +166,7 @@
               "data": {
                 "set": [
                   [
-                    "tcp",
+                    6,
                     {
                       "goto": {
                         "target": "filter_in_tcp"
@@ -174,7 +174,7 @@
                     }
                   ],
                   [
-                    "udp",
+                    17,
                     {
                       "goto": {
                         "target": "filter_in_udp"

diff --git a/tests/shell/testcases/optimizations/dumps/merge_vmaps.nft b/tests/shell/testcases/optimizations/dumps/merge_vmaps.nft
index c981acf0a77ceac8e15a11aeec3be79e3eaa7777..b0c384e85701670235209801b39e1976492de507 100644 (file)
--- a/tests/shell/testcases/optimizations/dumps/merge_vmaps.nft
+++ b/tests/shell/testcases/optimizations/dumps/merge_vmaps.nft
@@ -14,7 +14,7 @@ table ip x {
        chain y {
                update @s { ip saddr limit rate 12/minute burst 30 packets } accept
                tcp dport vmap { 80 : accept, 81 : accept, 443 : accept, 8000-8100 : accept, 24000-25000 : accept }
-               meta l4proto vmap { tcp : goto filter_in_tcp, udp : goto filter_in_udp }
+               meta l4proto vmap { 6 : goto filter_in_tcp, 17 : goto filter_in_udp }
                log
        }
 }

diff --git a/tests/shell/testcases/parsing/dumps/exclusive_start_cond.json-nft b/tests/shell/testcases/parsing/dumps/exclusive_start_cond.json-nft
index a1fbaafd1aa13bd5c865bfcd4977cc42e9c5e6b2..46ea3dcf24dd3b28daf2f0db839cb46c82be47f6 100644 (file)
--- a/tests/shell/testcases/parsing/dumps/exclusive_start_cond.json-nft
+++ b/tests/shell/testcases/parsing/dumps/exclusive_start_cond.json-nft
@@ -2018,7 +2018,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2051,7 +2051,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "udp"
+              "right": 17
             }
           },
           {
@@ -2092,7 +2092,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "udp"
+              "right": 17
             }
           },
           {
@@ -2148,7 +2148,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2188,7 +2188,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2207,7 +2207,7 @@
                   "field": "nexthdr"
                 }
               },
-              "right": "ip"
+              "right": 0
             }
           }
         ]
@@ -2228,7 +2228,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2247,7 +2247,7 @@
                   "field": "nexthdr"
                 }
               },
-              "right": "ip"
+              "right": 0
             }
           }
         ]
@@ -2268,7 +2268,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2308,7 +2308,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2348,7 +2348,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2388,7 +2388,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2407,7 +2407,7 @@
                   "field": "nexthdr"
                 }
               },
-              "right": "ip"
+              "right": 0
             }
           }
         ]
@@ -2428,7 +2428,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2447,7 +2447,7 @@
                   "field": "nexthdr"
                 }
               },
-              "right": "ip"
+              "right": 0
             }
           }
         ]
@@ -2468,7 +2468,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2487,7 +2487,7 @@
                   "field": "nexthdr"
                 }
               },
-              "right": "ip"
+              "right": 0
             }
           }
         ]
@@ -2508,7 +2508,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2562,7 +2562,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2617,7 +2617,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2656,7 +2656,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2695,7 +2695,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2734,7 +2734,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2788,7 +2788,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2821,7 +2821,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {
@@ -2854,7 +2854,7 @@
                   "key": "l4proto"
                 }
               },
-              "right": "tcp"
+              "right": 6
             }
           },
           {

diff --git a/tests/shell/testcases/parsing/dumps/exclusive_start_cond.nft b/tests/shell/testcases/parsing/dumps/exclusive_start_cond.nft
index 2b94feaa77d8ee8cc195dab735fbd588c54a01a5..7a7ce2141e057745029f2458f994db1a0093e16f 100644 (file)
--- a/tests/shell/testcases/parsing/dumps/exclusive_start_cond.nft
+++ b/tests/shell/testcases/parsing/dumps/exclusive_start_cond.nft
@@ -83,9 +83,9 @@ table ip t {
                limit rate 1/second burst 5 packets fib daddr . iif check exists
                limit rate 1/second burst 5 packets osf name "foo"
                limit rate 1/second burst 5 packets ipsec in spi 0
-               meta l4proto tcp limit rate 1/second burst 5 packets tproxy to 0.0.0.1
-               meta l4proto udp limit rate 1/second burst 5 packets vxlan vni 0
-               meta l4proto udp limit rate 1/second burst 5 packets geneve vni 0
+               meta l4proto 6 limit rate 1/second burst 5 packets tproxy to 0.0.0.1
+               meta l4proto 17 limit rate 1/second burst 5 packets vxlan vni 0
+               meta l4proto 17 limit rate 1/second burst 5 packets geneve vni 0
        }
 
        chain c2 {
@@ -93,35 +93,35 @@ table ip t {
 }
 table ip6 t {
        chain c {
-               meta l4proto tcp limit rate 1/second burst 5 packets ip6 saddr ::
-               meta l4proto tcp limit rate 1/second burst 5 packets hbh nexthdr ip
-               meta l4proto tcp limit rate 1/second burst 5 packets rt nexthdr ip
-               meta l4proto tcp limit rate 1/second burst 5 packets srh last-entry 0
-               meta l4proto tcp limit rate 1/second burst 5 packets srh sid[1] ::
-               meta l4proto tcp limit rate 1/second burst 5 packets srh tag 0
-               meta l4proto tcp limit rate 1/second burst 5 packets frag nexthdr ip
-               meta l4proto tcp limit rate 1/second burst 5 packets dst nexthdr ip
-               meta l4proto tcp limit rate 1/second burst 5 packets mh nexthdr ip
-               meta l4proto tcp limit rate 1/second burst 5 packets exthdr hbh missing
+               meta l4proto 6 limit rate 1/second burst 5 packets ip6 saddr ::
+               meta l4proto 6 limit rate 1/second burst 5 packets hbh nexthdr 0
+               meta l4proto 6 limit rate 1/second burst 5 packets rt nexthdr 0
+               meta l4proto 6 limit rate 1/second burst 5 packets srh last-entry 0
+               meta l4proto 6 limit rate 1/second burst 5 packets srh sid[1] ::
+               meta l4proto 6 limit rate 1/second burst 5 packets srh tag 0
+               meta l4proto 6 limit rate 1/second burst 5 packets frag nexthdr 0
+               meta l4proto 6 limit rate 1/second burst 5 packets dst nexthdr 0
+               meta l4proto 6 limit rate 1/second burst 5 packets mh nexthdr 0
+               meta l4proto 6 limit rate 1/second burst 5 packets exthdr hbh missing
        }
 }
 table arp t {
        chain c {
-               meta l4proto tcp limit rate 1/second burst 5 packets arp htype 0
+               meta l4proto 6 limit rate 1/second burst 5 packets arp htype 0
        }
 }
 table bridge t {
        chain c {
-               meta l4proto tcp limit rate 1/second burst 5 packets meta ibrname "foo"
-               meta l4proto tcp limit rate 1/second burst 5 packets meta ibrname "foo"
-               meta l4proto tcp limit rate 1/second burst 5 packets meta obrname "foo"
-               meta l4proto tcp limit rate 1/second burst 5 packets meta obrname "foo"
+               meta l4proto 6 limit rate 1/second burst 5 packets meta ibrname "foo"
+               meta l4proto 6 limit rate 1/second burst 5 packets meta ibrname "foo"
+               meta l4proto 6 limit rate 1/second burst 5 packets meta obrname "foo"
+               meta l4proto 6 limit rate 1/second burst 5 packets meta obrname "foo"
        }
 }
 table netdev t {
        chain c {
-               meta l4proto tcp limit rate 1/second burst 5 packets dup to "lo"
-               meta l4proto tcp limit rate 1/second burst 5 packets fwd to "lo"
-               meta l4proto tcp limit rate 1/second burst 5 packets tunnel id 0
+               meta l4proto 6 limit rate 1/second burst 5 packets dup to "lo"
+               meta l4proto 6 limit rate 1/second burst 5 packets fwd to "lo"
+               meta l4proto 6 limit rate 1/second burst 5 packets tunnel id 0
        }
 }

diff --git a/tests/shell/testcases/parsing/dumps/large_rule_pipe.json-nft b/tests/shell/testcases/parsing/dumps/large_rule_pipe.json-nft
index bf5dc65fe1ddd653a7986d73ec4011598a2e75f5..1310be6b5a3b031661fc019df06c9326d15062e4 100644 (file)
--- a/tests/shell/testcases/parsing/dumps/large_rule_pipe.json-nft
+++ b/tests/shell/testcases/parsing/dumps/large_rule_pipe.json-nft
@@ -2669,8 +2669,8 @@
               },
               "right": {
                 "set": [
-                  "icmp",
-                  "ipv6-icmp"
+                  1,
+                  58
                 ]
               }
             }
@@ -2838,8 +2838,8 @@
               },
               "right": {
                 "set": [
-                  "icmp",
-                  "ipv6-icmp"
+                  1,
+                  58
                 ]
               }
             }
@@ -3080,8 +3080,8 @@
               },
               "right": {
                 "set": [
-                  "icmp",
-                  "ipv6-icmp"
+                  1,
+                  58
                 ]
               }
             }
@@ -3595,8 +3595,8 @@
               },
               "right": {
                 "set": [
-                  "icmp",
-                  "ipv6-icmp"
+                  1,
+                  58
                 ]
               }
             }
@@ -3804,8 +3804,8 @@
               },
               "right": {
                 "set": [
-                  "icmp",
-                  "ipv6-icmp"
+                  1,
+                  58
                 ]
               }
             }
@@ -3973,8 +3973,8 @@
               },
               "right": {
                 "set": [
-                  "icmp",
-                  "ipv6-icmp"
+                  1,
+                  58
                 ]
               }
             }

diff --git a/tests/shell/testcases/parsing/dumps/large_rule_pipe.nft b/tests/shell/testcases/parsing/dumps/large_rule_pipe.nft
index c85a636a854e8e7dc718200f01a0df59b7985489..fd49e99bf701be2b4a8e73ae4ecdef0da2f45ee5 100644 (file)
--- a/tests/shell/testcases/parsing/dumps/large_rule_pipe.nft
+++ b/tests/shell/testcases/parsing/dumps/large_rule_pipe.nft
@@ -332,7 +332,7 @@ table inet firewalld {
                jump filter_IN_public_log
                jump filter_IN_public_deny
                jump filter_IN_public_allow
-               meta l4proto { icmp, ipv6-icmp } accept
+               meta l4proto { 1, 58 } accept
        }
 
        chain filter_IN_public_log {
@@ -350,7 +350,7 @@ table inet firewalld {
                jump filter_FWDI_public_log
                jump filter_FWDI_public_deny
                jump filter_FWDI_public_allow
-               meta l4proto { icmp, ipv6-icmp } accept
+               meta l4proto { 1, 58 } accept
        }
 
        chain filter_FWDI_public_log {
@@ -412,7 +412,7 @@ table inet firewalld {
                jump filter_IN_home_log
                jump filter_IN_home_deny
                jump filter_IN_home_allow
-               meta l4proto { icmp, ipv6-icmp } accept
+               meta l4proto { 1, 58 } accept
        }
 
        chain filter_IN_home_log {
@@ -438,7 +438,7 @@ table inet firewalld {
                jump filter_FWDI_home_log
                jump filter_FWDI_home_deny
                jump filter_FWDI_home_allow
-               meta l4proto { icmp, ipv6-icmp } accept
+               meta l4proto { 1, 58 } accept
        }
 
        chain filter_FWDI_home_log {
@@ -499,7 +499,7 @@ table inet firewalld {
                jump filter_IN_work_log
                jump filter_IN_work_deny
                jump filter_IN_work_allow
-               meta l4proto { icmp, ipv6-icmp } accept
+               meta l4proto { 1, 58 } accept
        }
 
        chain filter_IN_work_log {
@@ -517,7 +517,7 @@ table inet firewalld {
                jump filter_FWDI_work_log
                jump filter_FWDI_work_deny
                jump filter_FWDI_work_allow
-               meta l4proto { icmp, ipv6-icmp } accept
+               meta l4proto { 1, 58 } accept
        }
 
        chain filter_FWDI_work_log {

diff --git a/tests/shell/testcases/sets/dumps/0037_set_with_inet_service_0.json-nft b/tests/shell/testcases/sets/dumps/0037_set_with_inet_service_0.json-nft
index cf1c1cc9d479e676f6976d2ad8248fa2db00c8c0..ad1bf5d573ee7f8785662547cf1acd8c5d288a4e 100644 (file)
--- a/tests/shell/testcases/sets/dumps/0037_set_with_inet_service_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0037_set_with_inet_service_0.json-nft
@@ -41,35 +41,35 @@
           {
             "concat": [
               "192.168.0.12",
-              "tcp",
+              6,
               53
             ]
           },
           {
             "concat": [
               "192.168.0.12",
-              "tcp",
+              6,
               80
             ]
           },
           {
             "concat": [
               "192.168.0.12",
-              "udp",
+              17,
               53
             ]
           },
           {
             "concat": [
               "192.168.0.13",
-              "tcp",
+              6,
               80
             ]
           },
           {
             "concat": [
               "192.168.0.113",
-              "tcp",
+              6,
               22
             ]
           }

diff --git a/tests/shell/testcases/sets/dumps/0037_set_with_inet_service_0.nft b/tests/shell/testcases/sets/dumps/0037_set_with_inet_service_0.nft
index 0e85f7c20eba085b57eee4c0434ff6a579dea92d..d3bec3fe4ccf81b944ec50c0d4f33fbfdaa99d6c 100644 (file)
--- a/tests/shell/testcases/sets/dumps/0037_set_with_inet_service_0.nft
+++ b/tests/shell/testcases/sets/dumps/0037_set_with_inet_service_0.nft
@@ -1,11 +1,11 @@
 table inet filter {
        set myset {
                type ipv4_addr . inet_proto . inet_service
-               elements = { 192.168.0.12 . tcp . 53,
-                            192.168.0.12 . tcp . 80,
-                            192.168.0.12 . udp . 53,
-                            192.168.0.13 . tcp . 80,
-                            192.168.0.113 . tcp . 22 }
+               elements = { 192.168.0.12 . 6 . 53,
+                            192.168.0.12 . 6 . 80,
+                            192.168.0.12 . 17 . 53,
+                            192.168.0.13 . 6 . 80,
+                            192.168.0.113 . 6 . 22 }
        }
 
        chain forward {

diff --git a/tests/shell/testcases/sets/dumps/0047nat_0.nft b/tests/shell/testcases/sets/dumps/0047nat_0.nft
index 86dbb70880ff0a0c0fc2c9fa52d47c7cf6a46640..dd0bd7a6ab3de179ae55eee7cf77372ab5e5c6bf 100644 (file)
--- a/tests/shell/testcases/sets/dumps/0047nat_0.nft
+++ b/tests/shell/testcases/sets/dumps/0047nat_0.nft
@@ -9,7 +9,7 @@ table ip x {
 
        chain x {
                type nat hook prerouting priority dstnat; policy accept;
-               meta l4proto tcp dnat ip to iifname . ip saddr map { "enp2s0" . 10.1.1.136 : 1.1.2.69 . 22, "enp2s0" . 10.1.1.1-10.1.1.135 : 1.1.2.66-1.84.236.78 . 22 }
+               meta l4proto 6 dnat ip to iifname . ip saddr map { "enp2s0" . 10.1.1.136 : 1.1.2.69 . 22, "enp2s0" . 10.1.1.1-10.1.1.135 : 1.1.2.66-1.84.236.78 . 22 }
                dnat ip to iifname . ip saddr map { "enp2s0" . 10.1.1.136 : 1.1.2.69/32, "enp2s0" . 10.1.1.1-10.1.1.135 : 1.1.2.66-1.84.236.78 }
        }
 

diff --git a/tests/shell/testcases/sets/dumps/0067nat_concat_interval_0.nft b/tests/shell/testcases/sets/dumps/0067nat_concat_interval_0.nft
index 9ac3774a7222c7cc18683e76381617f3605544f0..e67906f2b613b9e82ec7922ca6721d252c347da9 100644 (file)
--- a/tests/shell/testcases/sets/dumps/0067nat_concat_interval_0.nft
+++ b/tests/shell/testcases/sets/dumps/0067nat_concat_interval_0.nft
@@ -27,9 +27,9 @@ table ip nat {
 
        chain prerouting {
                type nat hook prerouting priority dstnat; policy accept;
-               ip protocol tcp dnat ip to ip saddr . ip daddr map @ipportmap2
-               meta l4proto { tcp, udp } dnat ip to ip daddr . th dport map @fwdtoip_th
+               ip protocol 6 dnat ip to ip saddr . ip daddr map @ipportmap2
+               meta l4proto { 6, 17 } dnat ip to ip daddr . th dport map @fwdtoip_th
                dnat ip to iifname . ip saddr map @ipportmap4
-               meta l4proto tcp dnat ip to iifname . ip saddr map @ipportmap5
+               meta l4proto 6 dnat ip to iifname . ip saddr map @ipportmap5
        }
 }

diff --git a/tests/shell/testcases/sets/dumps/0067nat_interval_0.nft b/tests/shell/testcases/sets/dumps/0067nat_interval_0.nft
index 3e1584a8c5dc8eb53d10b19c6bb779d01a466117..315d68eb5e992176da324d1a600cc907e21cd014 100644 (file)
--- a/tests/shell/testcases/sets/dumps/0067nat_interval_0.nft
+++ b/tests/shell/testcases/sets/dumps/0067nat_interval_0.nft
@@ -8,6 +8,6 @@ table ip nat {
 
        chain prerouting {
                type nat hook prerouting priority dstnat; policy accept;
-               ip protocol tcp dnat ip to ip saddr map @ipportmap
+               ip protocol 6 dnat ip to ip saddr map @ipportmap
        }
 }

diff --git a/tests/shell/testcases/sets/dumps/set_eval_0.json-nft b/tests/shell/testcases/sets/dumps/set_eval_0.json-nft
index 6f692381b6f7c6ca4df2ace436b8cff935f5a8bf..133e52bfaeb8028491d5c03dc00f4f8c030db1f9 100644 (file)
--- a/tests/shell/testcases/sets/dumps/set_eval_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/set_eval_0.json-nft
@@ -55,8 +55,8 @@
               },
               "right": {
                 "set": [
-                  "tcp",
-                  "udp"
+                  6,
+                  17
                 ]
               }
             }

diff --git a/tests/shell/testcases/sets/dumps/set_eval_0.nft b/tests/shell/testcases/sets/dumps/set_eval_0.nft
index a45462b8adbfc48b69bd52e506fa56439f0dfb8f..93413f013fb5ae773247fa852ad87c04a643f04c 100644 (file)
--- a/tests/shell/testcases/sets/dumps/set_eval_0.nft
+++ b/tests/shell/testcases/sets/dumps/set_eval_0.nft
@@ -6,6 +6,6 @@ table ip nat {
 
        chain prerouting {
                type nat hook prerouting priority dstnat; policy accept;
-               meta l4proto { tcp, udp } th dport 443 dnat to 10.0.0.1
+               meta l4proto { 6, 17 } th dport 443 dnat to 10.0.0.1
        }
 }

diff --git a/tests/shell/testcases/sets/dumps/sets_with_ifnames.json-nft b/tests/shell/testcases/sets/dumps/sets_with_ifnames.json-nft
index 7b4849e0530d3c2c95e24a74e5929b27399b68b7..48293fb2e60e39ae6ed1f3a175b465bedae5b891 100644 (file)
--- a/tests/shell/testcases/sets/dumps/sets_with_ifnames.json-nft
+++ b/tests/shell/testcases/sets/dumps/sets_with_ifnames.json-nft
@@ -509,7 +509,7 @@
                   "field": "protocol"
                 }
               },
-              "right": "icmp"
+              "right": 1
             }
           },
           {
@@ -536,7 +536,7 @@
                   "field": "protocol"
                 }
               },
-              "right": "icmp"
+              "right": 1
             }
           },
           {

diff --git a/tests/shell/testcases/sets/dumps/sets_with_ifnames.nft b/tests/shell/testcases/sets/dumps/sets_with_ifnames.nft
index 8abca03a080ec722a7fb4b4016f5af1819315e7e..1536aaf6a0eabbc6f248fdb92e1b893185b39d02 100644 (file)
--- a/tests/shell/testcases/sets/dumps/sets_with_ifnames.nft
+++ b/tests/shell/testcases/sets/dumps/sets_with_ifnames.nft
@@ -53,8 +53,8 @@ table inet testifsets {
 
        chain input {
                type filter hook input priority filter; policy accept;
-               ip protocol icmp jump v4icmp
-               ip protocol icmp goto v4icmpc
+               ip protocol 1 jump v4icmp
+               ip protocol 1 goto v4icmpc
        }
 
        chain do_nothing {

diff --git a/tests/shell/testcases/transactions/dumps/0049huge_0.json-nft b/tests/shell/testcases/transactions/dumps/0049huge_0.json-nft
index 456ada9401709b7c57ba422546137f1801da0e21..496a2c2afd15a5e05433ac9122f38deb5d97e284 100644 (file)
--- a/tests/shell/testcases/transactions/dumps/0049huge_0.json-nft
+++ b/tests/shell/testcases/transactions/dumps/0049huge_0.json-nft
@@ -1908,8 +1908,8 @@
               },
               "right": {
                 "set": [
-                  "icmp",
-                  "ipv6-icmp"
+                  1,
+                  58
                 ]
               }
             }
@@ -2111,8 +2111,8 @@
               },
               "right": {
                 "set": [
-                  "icmp",
-                  "ipv6-icmp"
+                  1,
+                  58
                 ]
               }
             }
@@ -2854,8 +2854,8 @@
               },
               "right": {
                 "set": [
-                  "icmp",
-                  "ipv6-icmp"
+                  1,
+                  58
                 ]
               }
             }
@@ -3132,8 +3132,8 @@
               },
               "right": {
                 "set": [
-                  "icmp",
-                  "ipv6-icmp"
+                  1,
+                  58
                 ]
               }
             }

diff --git a/tests/shell/testcases/transactions/dumps/0049huge_0.nft b/tests/shell/testcases/transactions/dumps/0049huge_0.nft
index e42ad3e19a73bcc700f06a144bc68edf7c469fdb..80c10d57ab790568e97b4dfd752a11d4b005e1fb 100644 (file)
--- a/tests/shell/testcases/transactions/dumps/0049huge_0.nft
+++ b/tests/shell/testcases/transactions/dumps/0049huge_0.nft
@@ -98,7 +98,7 @@ table inet firewalld {
                jump filter_IN_public_deny
                jump filter_IN_public_allow
                jump filter_IN_public_post
-               meta l4proto { icmp, ipv6-icmp } accept
+               meta l4proto { 1, 58 } accept
        }
 
        chain filter_IN_public_pre {
@@ -124,7 +124,7 @@ table inet firewalld {
                jump filter_FWDI_public_deny
                jump filter_FWDI_public_allow
                jump filter_FWDI_public_post
-               meta l4proto { icmp, ipv6-icmp } accept
+               meta l4proto { 1, 58 } accept
        }
 
        chain filter_FWDI_public_pre {
@@ -335,7 +335,7 @@ table inet firewalld {
                jump filter_IN_work_deny
                jump filter_IN_work_allow
                jump filter_IN_work_post
-               meta l4proto { icmp, ipv6-icmp } accept
+               meta l4proto { 1, 58 } accept
        }
 
        chain filter_IN_work_pre {
@@ -384,7 +384,7 @@ table inet firewalld {
                jump filter_FWDI_work_deny
                jump filter_FWDI_work_allow
                jump filter_FWDI_work_post
-               meta l4proto { icmp, ipv6-icmp } accept
+               meta l4proto { 1, 58 } accept
        }
 
        chain filter_FWDI_work_pre {