X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/e66833d3112cbea68ae6dfedeb59158ebc6bacd5..f0033e0790c7f01b23f24504d3685cbaffc90f1f:/local.m4

diff --git a/local.m4 b/local.m4
index 9d4d917..d91b171 100644
--- a/local.m4
+++ b/local.m4
@@ -47,19 +47,19 @@ m4_divert(26)m4_dnl
 
 ## House networks.
 defnet dmz trusted
-	addr 62.49.204.144/28
+	addr 62.49.204.144/28 2001:470:1f09:1b98::/64
 	forwards unsafe untrusted
 defnet unsafe trusted
-	addr 172.29.199.0/25
+	addr 172.29.199.0/25 2001:470:9740:1::/64
 	forwards househub
 defnet safe safe
-	addr 172.29.199.192/28
+	addr 172.29.199.192/27 2001:470:9740:4001::/64
 	forwards househub
 defnet untrusted untrusted
-	addr 172.29.198.0/25
+	addr 172.29.198.0/25 2001:470:9740:8001::/64
 	forwards househub
 defnet vpn safe
-	addr 172.29.199.128/27
+	addr 172.29.199.128/27 2001:ba8:1d9:6000::/64
 	forwards househub colohub
 	host crybaby 1
 	host terror 2
@@ -106,10 +106,10 @@ defhost gibson
 
 ## Colocated networks.
 defnet jump trusted
-	addr 212.13.198.64/28
+	addr 212.13.198.64/28 2001:ba8:0:1d9::/64
 	forwards colohub
 defnet colo trusted
-	addr 172.29.199.176/28
+	addr 172.29.199.176/28 2001:ba8:1d9:2::/64
 	forwards colohub
 defnet colohub virtual
 	forwards colobdry jump colo
@@ -141,8 +141,9 @@ defhost jazz
 defnet hub virtual
 	forwards housebdry colobdry
 defnet default untrusted
-	addr 62.49.204.144/28
-	addr 212.13.198.64/28
+	addr 62.49.204.144/28 2001:470:1f09:1b98::/64
+	addr 212.13.198.64/28 2001:ba8:0:1d9::/64
+	addr 2001:ba8:1d9::/48 #temporary
 	forwards dmz untrusted unsafe jump colo
 
 m4_divert(80)m4_dnl
@@ -263,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 --------------------------------------------------