From 850f0a56b6ad625d6c5d8ba28ec4f55ec02ff2a7 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 28 Jul 2016 20:03:53 +0200 Subject: src: add 'to' for snat and dnat This is extra syntaxtic sugar to get this consistent with other statements such as redirect, masquerade, dup and fwd that indicates where to go. Existing syntax is still preserved, but the listing shows the one including 'to'. Signed-off-by: Pablo Neira Ayuso --- tests/py/ip6/dnat.t | 4 ++-- tests/py/ip6/dnat.t.payload.ip6 | 4 ++-- tests/py/ip6/snat.t | 4 ++-- tests/py/ip6/snat.t.payload.ip6 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/py/ip6') diff --git a/tests/py/ip6/dnat.t b/tests/py/ip6/dnat.t index b061f2f6..b256e018 100644 --- a/tests/py/ip6/dnat.t +++ b/tests/py/ip6/dnat.t @@ -2,5 +2,5 @@ *ip6;test-ip6;prerouting -tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:::80-100;ok -tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:: :100;ok;tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:::100 +tcp dport 80-90 dnat to 2001:838:35f:1::-2001:838:35f:2:::80-100;ok +tcp dport 80-90 dnat to 2001:838:35f:1::-2001:838:35f:2:: :100;ok;tcp dport 80-90 dnat to 2001:838:35f:1::-2001:838:35f:2:::100 diff --git a/tests/py/ip6/dnat.t.payload.ip6 b/tests/py/ip6/dnat.t.payload.ip6 index 13c7a0e3..494ade39 100644 --- a/tests/py/ip6/dnat.t.payload.ip6 +++ b/tests/py/ip6/dnat.t.payload.ip6 @@ -1,4 +1,4 @@ -# tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:::80-100 +# tcp dport 80-90 dnat to 2001:838:35f:1::-2001:838:35f:2:::80-100 ip6 test-ip6 prerouting [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000006 ] @@ -11,7 +11,7 @@ ip6 test-ip6 prerouting [ immediate reg 4 0x00006400 ] [ nat dnat ip6 addr_min reg 1 addr_max reg 2 proto_min reg 3 proto_max reg 4 ] -# tcp dport 80-90 dnat 2001:838:35f:1::-2001:838:35f:2:: :100 +# tcp dport 80-90 dnat to 2001:838:35f:1::-2001:838:35f:2:: :100 ip6 test-ip6 prerouting [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000006 ] diff --git a/tests/py/ip6/snat.t b/tests/py/ip6/snat.t index dec8dffa..b85d9af9 100644 --- a/tests/py/ip6/snat.t +++ b/tests/py/ip6/snat.t @@ -2,5 +2,5 @@ *ip6;test-ip6;postrouting -tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:: :80-100;ok;tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:::80-100 -tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:::100;ok +tcp dport 80-90 snat to 2001:838:35f:1::-2001:838:35f:2:: :80-100;ok;tcp dport 80-90 snat to 2001:838:35f:1::-2001:838:35f:2:::80-100 +tcp dport 80-90 snat to 2001:838:35f:1::-2001:838:35f:2:::100;ok diff --git a/tests/py/ip6/snat.t.payload.ip6 b/tests/py/ip6/snat.t.payload.ip6 index 486bbb8b..fbc99c1a 100644 --- a/tests/py/ip6/snat.t.payload.ip6 +++ b/tests/py/ip6/snat.t.payload.ip6 @@ -1,4 +1,4 @@ -# tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:: :80-100 +# tcp dport 80-90 snat to 2001:838:35f:1::-2001:838:35f:2:: :80-100 ip6 test-ip6 postrouting [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000006 ] @@ -11,7 +11,7 @@ ip6 test-ip6 postrouting [ immediate reg 4 0x00006400 ] [ nat snat ip6 addr_min reg 1 addr_max reg 2 proto_min reg 3 proto_max reg 4 ] -# tcp dport 80-90 snat 2001:838:35f:1::-2001:838:35f:2:::100 +# tcp dport 80-90 snat to 2001:838:35f:1::-2001:838:35f:2:::100 ip6 test-ip6 postrouting [ payload load 1b @ network header + 6 => reg 1 ] [ cmp eq reg 1 0x00000006 ] -- cgit v1.2.3