aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2017-11-01 10:52:37 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2017-11-01 10:52:37 +0200
commit57760b1a2b7172451b0e6bf77d31361a832456d2 (patch)
treea94068c9440f9d64a851da23ea712fb993b48ee7 /test
parentba2204ae5384939524d6d497c0cfc8b34e8b56da (diff)
downloadawall-57760b1a2b7172451b0e6bf77d31361a832456d2.tar.bz2
awall-57760b1a2b7172451b0e6bf77d31361a832456d2.tar.xz
test: zone: renumber marks
Diffstat (limited to 'test')
-rw-r--r--test/mandatory/zone.json6
-rw-r--r--test/output/address/dump46
-rw-r--r--test/output/address/rules-save12
-rw-r--r--test/output/address/rules6-save8
-rw-r--r--test/output/filter-limit/dump46
-rw-r--r--test/output/filter-limit/rules-save12
-rw-r--r--test/output/filter-limit/rules6-save8
-rw-r--r--test/output/filter/dump46
-rw-r--r--test/output/filter/rules-save12
-rw-r--r--test/output/filter/rules6-save8
-rw-r--r--test/output/no-track/dump46
-rw-r--r--test/output/no-track/rules-save12
-rw-r--r--test/output/no-track/rules6-save8
13 files changed, 135 insertions, 135 deletions
diff --git a/test/mandatory/zone.json b/test/mandatory/zone.json
index bbb9251..220bd9f 100644
--- a/test/mandatory/zone.json
+++ b/test/mandatory/zone.json
@@ -21,9 +21,9 @@
}
],
"mark": [
- { "in": [ "_fw", "A" ], "mark": 0 },
- { "in": "B", "out": "C", "mark": 1 },
- { "out": [ "_fw", "B" ], "mark": 2 }
+ { "in": [ "_fw", "A" ], "mark": 1 },
+ { "in": "B", "out": "C", "mark": 2 },
+ { "out": [ "_fw", "B" ], "mark": 3 }
],
"no-track": [
{ "in": [ "_fw", "A" ] },
diff --git a/test/output/address/dump b/test/output/address/dump
index 91cbb08..f6360bc 100644
--- a/test/output/address/dump
+++ b/test/output/address/dump
@@ -2435,24 +2435,24 @@ Log none {"mode":"none"}
(log)
-Mark 1 {"in":["_fw","A"],"mark":0}
+Mark 1 {"in":["_fw","A"],"mark":1}
(zone)
- inet/mangle/OUTPUT -j MARK --set-mark 0
- inet/mangle/PREROUTING -i eth0 -j MARK --set-mark 0
- inet6/mangle/OUTPUT -j MARK --set-mark 0
- inet6/mangle/PREROUTING -i eth0 -j MARK --set-mark 0
+ inet/mangle/OUTPUT -j MARK --set-mark 1
+ inet/mangle/PREROUTING -i eth0 -j MARK --set-mark 1
+ inet6/mangle/OUTPUT -j MARK --set-mark 1
+ inet6/mangle/PREROUTING -i eth0 -j MARK --set-mark 1
-Mark 2 {"in":"B","mark":1,"out":"C"}
+Mark 2 {"in":"B","mark":2,"out":"C"}
(zone)
- inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 1
- inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 1
+ inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 2
+ inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 2
-Mark 3 {"mark":2,"out":["_fw","B"]}
+Mark 3 {"mark":3,"out":["_fw","B"]}
(zone)
- inet/mangle/INPUT -j MARK --set-mark 2
- inet/mangle/POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 2
- inet6/mangle/INPUT -j MARK --set-mark 2
- inet6/mangle/POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 2
+ inet/mangle/INPUT -j MARK --set-mark 3
+ inet/mangle/POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 3
+ inet6/mangle/INPUT -j MARK --set-mark 3
+ inet6/mangle/POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 3
No-track 1 {"in":["_fw","A"]}
@@ -4306,12 +4306,12 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 1
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 1
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*nat
:INPUT ACCEPT [0:0]
@@ -4512,10 +4512,10 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*raw
:OUTPUT ACCEPT [0:0]
diff --git a/test/output/address/rules-save b/test/output/address/rules-save
index c1e91b4..665a4c5 100644
--- a/test/output/address/rules-save
+++ b/test/output/address/rules-save
@@ -1623,12 +1623,12 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 1
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 1
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*nat
:INPUT ACCEPT [0:0]
diff --git a/test/output/address/rules6-save b/test/output/address/rules6-save
index 8612d82..746f612 100644
--- a/test/output/address/rules6-save
+++ b/test/output/address/rules6-save
@@ -174,10 +174,10 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*raw
:OUTPUT ACCEPT [0:0]
diff --git a/test/output/filter-limit/dump b/test/output/filter-limit/dump
index 0d2a699..0bacdc8 100644
--- a/test/output/filter-limit/dump
+++ b/test/output/filter-limit/dump
@@ -19792,24 +19792,24 @@ Log none {"mode":"none"}
(log)
-Mark 1 {"in":["_fw","A"],"mark":0}
+Mark 1 {"in":["_fw","A"],"mark":1}
(zone)
- inet/mangle/OUTPUT -j MARK --set-mark 0
- inet/mangle/PREROUTING -i eth0 -j MARK --set-mark 0
- inet6/mangle/OUTPUT -j MARK --set-mark 0
- inet6/mangle/PREROUTING -i eth0 -j MARK --set-mark 0
+ inet/mangle/OUTPUT -j MARK --set-mark 1
+ inet/mangle/PREROUTING -i eth0 -j MARK --set-mark 1
+ inet6/mangle/OUTPUT -j MARK --set-mark 1
+ inet6/mangle/PREROUTING -i eth0 -j MARK --set-mark 1
-Mark 2 {"in":"B","mark":1,"out":"C"}
+Mark 2 {"in":"B","mark":2,"out":"C"}
(zone)
- inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 1
- inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 1
+ inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 2
+ inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 2
-Mark 3 {"mark":2,"out":["_fw","B"]}
+Mark 3 {"mark":3,"out":["_fw","B"]}
(zone)
- inet/mangle/INPUT -j MARK --set-mark 2
- inet/mangle/POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 2
- inet6/mangle/INPUT -j MARK --set-mark 2
- inet6/mangle/POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 2
+ inet/mangle/INPUT -j MARK --set-mark 3
+ inet/mangle/POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 3
+ inet6/mangle/INPUT -j MARK --set-mark 3
+ inet6/mangle/POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 3
No-track 1 {"in":["_fw","A"]}
@@ -29106,12 +29106,12 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 1
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 1
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*nat
:INPUT ACCEPT [0:0]
@@ -38724,10 +38724,10 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*raw
:OUTPUT ACCEPT [0:0]
diff --git a/test/output/filter-limit/rules-save b/test/output/filter-limit/rules-save
index d4f2a44..cb0ce4c 100644
--- a/test/output/filter-limit/rules-save
+++ b/test/output/filter-limit/rules-save
@@ -9066,12 +9066,12 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 1
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 1
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*nat
:INPUT ACCEPT [0:0]
diff --git a/test/output/filter-limit/rules6-save b/test/output/filter-limit/rules6-save
index da3fbec..8d4bfa7 100644
--- a/test/output/filter-limit/rules6-save
+++ b/test/output/filter-limit/rules6-save
@@ -9042,10 +9042,10 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*raw
:OUTPUT ACCEPT [0:0]
diff --git a/test/output/filter/dump b/test/output/filter/dump
index c6b0b60..224503c 100644
--- a/test/output/filter/dump
+++ b/test/output/filter/dump
@@ -316,24 +316,24 @@ Log none {"mode":"none"}
(log)
-Mark 1 {"in":["_fw","A"],"mark":0}
+Mark 1 {"in":["_fw","A"],"mark":1}
(zone)
- inet/mangle/OUTPUT -j MARK --set-mark 0
- inet/mangle/PREROUTING -i eth0 -j MARK --set-mark 0
- inet6/mangle/OUTPUT -j MARK --set-mark 0
- inet6/mangle/PREROUTING -i eth0 -j MARK --set-mark 0
+ inet/mangle/OUTPUT -j MARK --set-mark 1
+ inet/mangle/PREROUTING -i eth0 -j MARK --set-mark 1
+ inet6/mangle/OUTPUT -j MARK --set-mark 1
+ inet6/mangle/PREROUTING -i eth0 -j MARK --set-mark 1
-Mark 2 {"in":"B","mark":1,"out":"C"}
+Mark 2 {"in":"B","mark":2,"out":"C"}
(zone)
- inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 1
- inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 1
+ inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 2
+ inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 2
-Mark 3 {"mark":2,"out":["_fw","B"]}
+Mark 3 {"mark":3,"out":["_fw","B"]}
(zone)
- inet/mangle/INPUT -j MARK --set-mark 2
- inet/mangle/POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 2
- inet6/mangle/INPUT -j MARK --set-mark 2
- inet6/mangle/POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 2
+ inet/mangle/INPUT -j MARK --set-mark 3
+ inet/mangle/POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 3
+ inet6/mangle/INPUT -j MARK --set-mark 3
+ inet6/mangle/POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 3
No-track 1 {"in":["_fw","A"]}
@@ -716,12 +716,12 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 1
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 1
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*nat
:INPUT ACCEPT [0:0]
@@ -878,10 +878,10 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*raw
:OUTPUT ACCEPT [0:0]
diff --git a/test/output/filter/rules-save b/test/output/filter/rules-save
index df9ab36..0a18dcb 100644
--- a/test/output/filter/rules-save
+++ b/test/output/filter/rules-save
@@ -152,12 +152,12 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 1
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 1
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*nat
:INPUT ACCEPT [0:0]
diff --git a/test/output/filter/rules6-save b/test/output/filter/rules6-save
index f2149d0..2c37d01 100644
--- a/test/output/filter/rules6-save
+++ b/test/output/filter/rules6-save
@@ -128,10 +128,10 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*raw
:OUTPUT ACCEPT [0:0]
diff --git a/test/output/no-track/dump b/test/output/no-track/dump
index 230dae5..8738f1e 100644
--- a/test/output/no-track/dump
+++ b/test/output/no-track/dump
@@ -312,24 +312,24 @@ Log none {"mode":"none"}
(log)
-Mark 1 {"in":["_fw","A"],"mark":0}
+Mark 1 {"in":["_fw","A"],"mark":1}
(zone)
- inet/mangle/OUTPUT -j MARK --set-mark 0
- inet/mangle/PREROUTING -i eth0 -j MARK --set-mark 0
- inet6/mangle/OUTPUT -j MARK --set-mark 0
- inet6/mangle/PREROUTING -i eth0 -j MARK --set-mark 0
+ inet/mangle/OUTPUT -j MARK --set-mark 1
+ inet/mangle/PREROUTING -i eth0 -j MARK --set-mark 1
+ inet6/mangle/OUTPUT -j MARK --set-mark 1
+ inet6/mangle/PREROUTING -i eth0 -j MARK --set-mark 1
-Mark 2 {"in":"B","mark":1,"out":"C"}
+Mark 2 {"in":"B","mark":2,"out":"C"}
(zone)
- inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 1
- inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 1
+ inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 2
+ inet/mangle/FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 2
-Mark 3 {"mark":2,"out":["_fw","B"]}
+Mark 3 {"mark":3,"out":["_fw","B"]}
(zone)
- inet/mangle/INPUT -j MARK --set-mark 2
- inet/mangle/POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 2
- inet6/mangle/INPUT -j MARK --set-mark 2
- inet6/mangle/POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 2
+ inet/mangle/INPUT -j MARK --set-mark 3
+ inet/mangle/POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 3
+ inet6/mangle/INPUT -j MARK --set-mark 3
+ inet6/mangle/POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 3
No-track 1 {"in":["_fw","A"]}
@@ -706,12 +706,12 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 1
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 1
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*nat
:INPUT ACCEPT [0:0]
@@ -860,10 +860,10 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*raw
:OUTPUT ACCEPT [0:0]
diff --git a/test/output/no-track/rules-save b/test/output/no-track/rules-save
index a818873..49fb794 100644
--- a/test/output/no-track/rules-save
+++ b/test/output/no-track/rules-save
@@ -146,12 +146,12 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 1
--A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 1
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth2 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A FORWARD -i eth1 -s 10.0.0.0/12 -o eth3 -d 10.1.0.0/12 -j MARK --set-mark 2
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d 10.0.0.0/12 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*nat
:INPUT ACCEPT [0:0]
diff --git a/test/output/no-track/rules6-save b/test/output/no-track/rules6-save
index 57e52ed..765a328 100644
--- a/test/output/no-track/rules6-save
+++ b/test/output/no-track/rules6-save
@@ -104,10 +104,10 @@ COMMIT
:OUTPUT ACCEPT [0:0]
:POSTROUTING ACCEPT [0:0]
:PREROUTING ACCEPT [0:0]
--A INPUT -j MARK --set-mark 2
--A OUTPUT -j MARK --set-mark 0
--A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 2
--A PREROUTING -i eth0 -j MARK --set-mark 0
+-A INPUT -j MARK --set-mark 3
+-A OUTPUT -j MARK --set-mark 1
+-A POSTROUTING -o eth1 -d fc00::/7 -j MARK --set-mark 3
+-A PREROUTING -i eth0 -j MARK --set-mark 1
COMMIT
*raw
:OUTPUT ACCEPT [0:0]
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 14:36:41 +0000