From 788c986343bc24bd0272e8aa409121ffe51f1ef3 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 15 Aug 2016 13:14:18 +0200 Subject: 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 --- tests/py/ip/dup.t | 4 ++-- tests/py/ip/dup.t.payload | 4 ++-- tests/py/ip/ip.t | 16 ++++++++-------- tests/py/ip/ip.t.payload | 14 +++++++------- tests/py/ip/ip.t.payload.inet | 14 +++++++------- tests/py/ip/ip.t.payload.netdev | 14 +++++++------- 6 files changed, 33 insertions(+), 33 deletions(-) (limited to 'tests/py/ip') diff --git a/tests/py/ip/dup.t b/tests/py/ip/dup.t index ac4e83a2..5119636a 100644 --- 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 1799b3d2..94d55c6f 100644 --- 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 8fa53be4..8ed2e99c 100644 --- 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 75e85c18..4c7bd7df 100644 --- 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 5cdf2a60..baaf7b35 100644 --- 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 134fb730..2d8f947a 100644 --- 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 ] -- cgit v1.2.3