statement: fix print of ip dnat address
Florian Westphal
maintainerPATCH 1/1 statement: fix print of ip dnat address
the change causes non-ipv6 addresses to not be printed at all in case a nfproto was given.
Also add a test case to catch this.
Fixes 5ab0e10fc6e2c22363a ("src: support for RFC2732 IPv6 address format with brackets")
Signed-off-by Florian Westphal <[email protected]>
--- src/statement.c | 2 ++ tests/py/ip/dnat.t | 1 + tests/py/ip/dnat.t.payload.ip | 12 ++++++++++++ 3 files changed, 15 insertions(+)
src/statement.c +2 -0
@@ -508,6 +508,8 @@ static void nat_stmt_print(const struct stmt *stmt)printf ("]-[" );expr_print (stmt->nat.addr->right);printf ("]" ); + }else { +expr_print (stmt->nat.addr); } }else {expr_print (stmt->nat.addr);
tests/py/ip/dnat.t +1 -0
@@ -7,6 +7,7 @@ iifname "eth0" tcp dport != 80-90 dnat to 192.168.3.2;ok iifname "eth0" tcp dport {80, 90, 23} dnat to 192.168.3.2;ok iifname "eth0" tcp dport != {80, 90, 23} dnat to 192.168.3.2;ok iifname "eth0" tcp dport != 23-34 dnat to 192.168.3.2;ok +iifname "eth0" tcp dport 81 dnat to 192.168.3.2:8080;ok dnat to ct mark map { 0x00000014 : 1.2.3.4};ok dnat to ct mark . ip daddr map { 0x00000014 . 1.1.1.1 : 1.2.3.4};ok
tests/py/ip/dnat.t.payload.ip +12 -0
@@ -60,6 +60,18 @@ ip test-ip4 prerouting [ immediate reg 1 0x0203a8c0 ] [ nat dnat ip addr_min reg 1 addr_max reg 0 ] +# iifname "eth0" tcp dport 81 dnat to 192.168.3.2:8080 +ip test-ip4 prerouting + [ meta load iifname => reg 1 ] + [ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ] + [ payload load 1b @ network header + 9 => reg 1 ] + [ cmp eq reg 1 0x00000006 ] + [ payload load 2b @ transport header + 2 => reg 1 ] + [ cmp eq reg 1 0x00005100 ] + [ immediate reg 1 0x0203a8c0 ] + [ immediate reg 2 0x0000901f ] + [ nat dnat ip addr_min reg 1 addr_max reg 0 proto_min reg 2 proto_max reg 0 ] + # dnat to ct mark map { 0x00000014 : 1.2.3.4} __map%d test-ip4 b __map%d test-ip4 0
Signature · 1 line
2.10.2
Quoted 8 lines · Florian Westphal
the change causes non-ipv6 addresses to not be printed at all in case a nfproto was given.
Also add a test case to catch this.
Fixes 5ab0e10fc6e2c22363a ("src: support for RFC2732 IPv6 address format with brackets")Signed-off-by Florian Westphal <[email protected]>
Thanks for fixing up this one.