masquerade: rename chainv1.7.0

avoid double awall prefix

19 files changed, 57 insertions, 57 deletions

diff --git a/awall/modules/masquerade.lua b/awall/modules/masquerade.lua
index 0ee9c94..b13bcc6 100644
--- a/awall/modules/masquerade.lua
+++ b/awall/modules/masquerade.lua
@@ -1,6 +1,6 @@
 --[[
 IPSet-based masquerading module for Alpine Wall
-Copyright (C) 2012-2016 Kaarle Ritvanen
+Copyright (C) 2012-2020 Kaarle Ritvanen
 See LICENSE file for license details
 ]]--
 
@@ -15,12 +15,12 @@ return {
 	       table='nat',
 	       chain='POSTROUTING',
 	       match='-m set --match-set awall-masquerade src',
-	       target='awall-masquerade'
+	       target='masquerade'
 	    },
 	    {
 	       family='inet',
 	       table='nat',
-	       chain='awall-masquerade',
+	       chain='masquerade',
 	       match='-m set ! --match-set awall-masquerade dst',
 	       target='MASQUERADE'
 	    }
diff --git a/test/output/address/dump b/test/output/address/dump
index 9f973a8..10996bd 100644
--- a/test/output/address/dump
+++ b/test/output/address/dump
@@ -12614,14 +12614,14 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/address/rules-save b/test/output/address/rules-save
index 7af7160..71b4218 100644
--- a/test/output/address/rules-save
+++ b/test/output/address/rules-save
@@ -4240,14 +4240,14 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/custom/dump b/test/output/custom/dump
index d303215..c4d67f7 100644
--- a/test/output/custom/dump
+++ b/test/output/custom/dump
@@ -871,16 +871,16 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth4 -j NETMAP --to 10.1.0.0/12
 -A PREROUTING -i eth5 -j NETMAP --to 10.1.0.0/12
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/custom/rules-save b/test/output/custom/rules-save
index 57e2166..66ff5bd 100644
--- a/test/output/custom/rules-save
+++ b/test/output/custom/rules-save
@@ -200,16 +200,16 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth4 -j NETMAP --to 10.1.0.0/12
 -A PREROUTING -i eth5 -j NETMAP --to 10.1.0.0/12
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/dedicated/dump b/test/output/dedicated/dump
index 8c8530a..2f21992 100644
--- a/test/output/dedicated/dump
+++ b/test/output/dedicated/dump
@@ -866,7 +866,7 @@ COMMIT
 :awall-OUTPUT - [0:0]
 :awall-POSTROUTING - [0:0]
 :awall-PREROUTING - [0:0]
-:awall-awall-masquerade - [0:0]
+:awall-masquerade - [0:0]
 -A INPUT -j awall-INPUT
 -A OUTPUT -j awall-OUTPUT
 -A POSTROUTING -j awall-POSTROUTING
@@ -874,10 +874,10 @@ COMMIT
 -A awall-INPUT -j MASQUERADE
 -A awall-OUTPUT -j REDIRECT
 -A awall-POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A awall-POSTROUTING -m set --match-set awall-masquerade src -j awall-awall-masquerade
+-A awall-POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
 -A awall-PREROUTING -i eth0 -j REDIRECT
 -A awall-PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/dedicated/rules-save b/test/output/dedicated/rules-save
index 4ce5699..cdb7be0 100644
--- a/test/output/dedicated/rules-save
+++ b/test/output/dedicated/rules-save
@@ -214,7 +214,7 @@ COMMIT
 :awall-OUTPUT - [0:0]
 :awall-POSTROUTING - [0:0]
 :awall-PREROUTING - [0:0]
-:awall-awall-masquerade - [0:0]
+:awall-masquerade - [0:0]
 -A INPUT -j awall-INPUT
 -A OUTPUT -j awall-OUTPUT
 -A POSTROUTING -j awall-POSTROUTING
@@ -222,10 +222,10 @@ COMMIT
 -A awall-INPUT -j MASQUERADE
 -A awall-OUTPUT -j REDIRECT
 -A awall-POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A awall-POSTROUTING -m set --match-set awall-masquerade src -j awall-awall-masquerade
+-A awall-POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
 -A awall-PREROUTING -i eth0 -j REDIRECT
 -A awall-PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/filter-dnat/dump b/test/output/filter-dnat/dump
index cceeff1..01457e2 100644
--- a/test/output/filter-dnat/dump
+++ b/test/output/filter-dnat/dump
@@ -862,16 +862,16 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth0 -p tcp --dport 25 -d 192.168.0.1 -j DNAT --to-destination 10.0.0.1
 -A PREROUTING -i eth0 -p tcp --dport 80 -d 192.168.0.2 -j DNAT --to-destination 10.0.0.2:8080
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/filter-dnat/rules-save b/test/output/filter-dnat/rules-save
index 5c92af8..d89d92a 100644
--- a/test/output/filter-dnat/rules-save
+++ b/test/output/filter-dnat/rules-save
@@ -198,16 +198,16 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth0 -p tcp --dport 25 -d 192.168.0.1 -j DNAT --to-destination 10.0.0.1
 -A PREROUTING -i eth0 -p tcp --dport 80 -d 192.168.0.2 -j DNAT --to-destination 10.0.0.2:8080
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/filter-limit/dump b/test/output/filter-limit/dump
index 46a3c5e..9999fc7 100644
--- a/test/output/filter-limit/dump
+++ b/test/output/filter-limit/dump
@@ -90106,14 +90106,14 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/filter-limit/rules-save b/test/output/filter-limit/rules-save
index 01016b3..6db9a31 100644
--- a/test/output/filter-limit/rules-save
+++ b/test/output/filter-limit/rules-save
@@ -30304,14 +30304,14 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/filter/dump b/test/output/filter/dump
index 25396fb..3d60ae6 100644
--- a/test/output/filter/dump
+++ b/test/output/filter/dump
@@ -946,14 +946,14 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/filter/rules-save b/test/output/filter/rules-save
index 3d22084..f8ebafe 100644
--- a/test/output/filter/rules-save
+++ b/test/output/filter/rules-save
@@ -224,14 +224,14 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/no-track/dump b/test/output/no-track/dump
index 14d51ec..5327c5a 100644
--- a/test/output/no-track/dump
+++ b/test/output/no-track/dump
@@ -936,14 +936,14 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/no-track/rules-save b/test/output/no-track/rules-save
index ad71f1b..441e3f6 100644
--- a/test/output/no-track/rules-save
+++ b/test/output/no-track/rules-save
@@ -218,14 +218,14 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/route-track/dump b/test/output/route-track/dump
index 62b6c43..775db17 100644
--- a/test/output/route-track/dump
+++ b/test/output/route-track/dump
@@ -864,14 +864,14 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/route-track/rules-save b/test/output/route-track/rules-save
index 4071f9e..0db027d 100644
--- a/test/output/route-track/rules-save
+++ b/test/output/route-track/rules-save
@@ -200,14 +200,14 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/tproxy/dump b/test/output/tproxy/dump
index 5d226e9..d9492cd 100644
--- a/test/output/tproxy/dump
+++ b/test/output/tproxy/dump
@@ -857,14 +857,14 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]
diff --git a/test/output/tproxy/rules-save b/test/output/tproxy/rules-save
index 3620968..5bbc912 100644
--- a/test/output/tproxy/rules-save
+++ b/test/output/tproxy/rules-save
@@ -199,14 +199,14 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 :PREROUTING ACCEPT [0:0]
-:awall-masquerade - [0:0]
+:masquerade - [0:0]
 -A INPUT -j MASQUERADE
 -A OUTPUT -j REDIRECT
 -A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MASQUERADE
--A POSTROUTING -m set --match-set awall-masquerade src -j awall-masquerade
+-A POSTROUTING -m set --match-set awall-masquerade src -j masquerade
 -A PREROUTING -i eth0 -j REDIRECT
 -A PREROUTING -i eth1 -s 10.0.0.0/12 -j REDIRECT
--A awall-masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
+-A masquerade -m set ! --match-set awall-masquerade dst -j MASQUERADE
 COMMIT
 *raw
 :OUTPUT ACCEPT [0:0]