X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/78af294cd1005453cf8b7a0dda4593ba101b345e..06ff80827cd67ab85ee31fc32fc5e740bda9193e:/local.m4

diff --git a/local.m4 b/local.m4
index b31b649..2d9cacb 100644
--- a/local.m4
+++ b/local.m4
@@ -75,29 +75,29 @@ defnet housebdry virtual
 ## House hosts.
 defhost radius
 	router
-	iface eth0 dmz
-	iface eth1 unsafe
+	iface eth0 dmz unsafe
+	iface eth1 dmz unsafe
 	iface eth2 safe
 	iface eth3 untrusted
 defhost roadstar
-	iface eth0 dmz
-	iface eth1 unsafe
+	iface eth0 dmz unsafe
+	iface eth1 dmz unsafe
 defhost jem
-	iface eth0 dmz
-	iface eth1 unsafe
+	iface eth0 dmz unsafe
+	iface eth1 dmz unsafe
 defhost artist
-	iface eth0 dmz
-	iface eth1 unsafe
+	iface eth0 dmz unsafe
+	iface eth1 dmz unsafe
 defhost vampire
 	router
-	iface eth0.0 dmz
-	iface eth0.1 unsafe
+	iface eth0.0 dmz unsafe
+	iface eth0.1 dmz unsafe
 	iface eth0.3 untrusted
 	iface dns0 dns
 	iface vpn-+ vpn
 	iface vpn-precision colobdry vpn
 defhost ibanez
-	iface br-dmz dmz
+	iface br-dmz dmz unsafe
 	iface br-unsafe unsafe
 
 defhost gibson
@@ -118,23 +118,23 @@ defnet colobdry virtual
 
 ## Colocated hosts.
 defhost fender
-	iface br-jump jump
-	iface br-colo colo
+	iface br-jump jump colo
+	iface br-colo jump colo
 defhost precision
 	router
-	iface eth0 jump
-	iface eth1 colo
+	iface eth0 jump colo
+	iface eth1 jump colo
 	iface vpn-+ vpn
 	iface vpn-vampire housebdry vpn
 defhost telecaster
-	iface eth0 jump
-	iface eth1 colo
+	iface eth0 jump colo
+	iface eth1 jump colo
 defhost stratocaster
-	iface eth0 jump
-	iface eth1 colo
+	iface eth0 jump colo
+	iface eth1 jump colo
 defhost jazz
-	iface eth0 jump
-	iface eth1 colo
+	iface eth0 jump colo
+	iface eth1 jump colo
 
 ## Other networks.
 defnet hub virtual
@@ -237,18 +237,18 @@ 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:
+seen=:-:
+for net in $allnets; do
+  eval class=\$net_class_$net
+  case $class in trusted) ;; *) continue ;; esac
+  for iface in $(net_interfaces FWHOST $net); do
+    case "$seen" in *:$iface:*) continue ;; esac
+    seen=$seen$iface:
     run iptables -A inbound -j ACCEPT \
 	-s 0.0.0.0 -d 224.0.0.0/24 \
-	-i $i
+	-i $iface
   done
-}
+done
 
 ## Allow incoming ping.  This is the only ICMP left.
 run ip46tables -A inbound -j ACCEPT -p icmp