X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/a0ade6f121b4a25c327acdaa1ea584f85d1c8845..08926d25f80fecabb4ef2b3f1e63b3a361ecdb59:/local.m4

diff --git a/local.m4 b/local.m4
index f6b5f46..2d880b9 100644
--- a/local.m4
+++ b/local.m4
@@ -38,6 +38,14 @@ m4_divert(-1)m4_dnl
 m4_divert(46)m4_dnl
 ## Networks and routing.
 
+defiface $if_dmz \
+	trusted:62.49.204.144/28 \
+	trusted:172.29.199.0/25 \
+	untrusted:default
+defiface $if_trusted \
+	trusted:172.29.199.0/25 \
+	untrusted:default
+defiface $if_safe safe:172.29.199.192/26
 defiface $if_untrusted \
 	untrusted:172.29.198.0/25
 defvpn $if_vpn safe 172.29.199.128/27 \
@@ -46,10 +54,6 @@ defvpn $if_vpn safe 172.29.199.128/27 \
 defiface $if_iodine untrusted:172.29.198.128/28
 defiface $if_its_mz safe:172.29.199.160/30
 defiface $if_its_pi safe:192.168.0.0/24
-defiface $if_trusted \
-	trusted:172.29.199.0/26 \
-	safe:172.29.199.64/27 \
-	untrusted:default
 
 ## Default NTP servers.
 ntp_servers="158.152.1.76 158.152.1.204 194.159.253.2 195.173.57.232"
@@ -134,12 +138,21 @@ run iptables -A inbound -j ACCEPT \
 	-s 172.29.198.0/23 \
 	-p udp --source-port $port_bootpc --destination-port $port_bootps
 
-## Incoming broadcast multicast on a network interface associated with the
-## trusted network is OK, since it must have originated there (or been
-## forwarded, but we don't do that yet).
-run iptables -A inbound -j ACCEPT \
+## Incoming multicast on a network interface associated with a trusted
+## network is OK, since it must have originated there (or been forwarded, but
+## we don't do that yet).
+for i in $(echo $if_trusted $if_dmz $if_safe | sed 'y/,/ /'); do
+  echo $i
+done | {
+  seen=:
+  while read i; do
+    case "$seen" in *:$i:*) continue ;; esac
+    seen=$seen$i:
+    run iptables -A inbound -j ACCEPT \
 	-s 0.0.0.0 -d 224.0.0.0/24 \
-	-i $if_trusted
+	-i $i
+  done
+}
 
 ## Allow incoming ping.  This is the only ICMP left.
 run ip46tables -A inbound -j ACCEPT -p icmp