vampire.m4: Extend services to untrusted hosts over IPv6.

[firewall] / local.m4

diff --git a/local.m4 b/local.m4
index 42ef732..d91b171 100644 (file)
--- a/local.m4
+++ b/local.m4
@@ -53,7 +53,7 @@ defnet unsafe trusted
        addr 172.29.199.0/25 2001:470:9740:1::/64
        forwards househub
 defnet safe safe
-       addr 172.29.199.192/28 2001:470:9740:4001::/64
+       addr 172.29.199.192/27 2001:470:9740:4001::/64
        forwards househub
 defnet untrusted untrusted
        addr 172.29.198.0/25 2001:470:9740:8001::/64
@@ -264,12 +264,9 @@ run ip46tables -A inbound -j forbidden
 run ip46tables -A INPUT -m mark --mark $from_untrusted/$MASK_FROM -g inbound
 
 ## Otherwise process as indicated by the mark.
-run ip46tables -A INPUT -m mark ! --mark 0/$MASK_MASK -j ACCEPT
-case $forward in
-  1)
-    run ip46tables -A FORWARD -m mark ! --mark 0/$MASK_MASK -j ACCEPT
-    ;;
-esac
+for i in $inchains; do
+  run ip46tables -A $i -m mark ! --mark 0/$MASK_MASK -j ACCEPT
+done
 
 m4_divert(-1)
 ###----- That's all, folks --------------------------------------------------