diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-08-15 13:14:18 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-08-18 03:14:08 +0200 |
commit | 788c986343bc24bd0272e8aa409121ffe51f1ef3 (patch) | |
tree | 42cf0210e9fce93e0a5a951f0012e891fa750b05 /tests/py/inet | |
parent | ddb1f1f8cdca2e0f70254a5adcc0291907503a36 (diff) |
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>
Diffstat (limited to 'tests/py/inet')
-rw-r--r-- | tests/py/inet/udp.t | 4 | ||||
-rw-r--r-- | tests/py/inet/udp.t.payload.inet | 4 | ||||
-rw-r--r-- | tests/py/inet/udp.t.payload.ip | 4 | ||||
-rw-r--r-- | tests/py/inet/udp.t.payload.ip6 | 4 | ||||
-rw-r--r-- | tests/py/inet/udp.t.payload.netdev | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/tests/py/inet/udp.t b/tests/py/inet/udp.t index ea9c87b4..060985c8 100644 --- 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 1f49438d..a2717f39 100644 --- 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 8b4550dc..5d36fe5f 100644 --- 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 86204f6c..22aa57ff 100644 --- 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 2eb2a76d..92858cf0 100644 --- 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 ] |