X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/c68b8ecca140f3382431eb3d65ffe6a6ac3ba121..2b17ac87c0bbb773745e10a72fd2608bda8d0686:/local.m4

diff --git a/local.m4 b/local.m4
index 3e33b3b..e083a64 100644
--- a/local.m4
+++ b/local.m4
@@ -71,11 +71,15 @@ defnet housebdry virtual
 
 ## House hosts.
 defhost radius
-	router
-	iface eth0 dmz unsafe safe
-	iface eth1 dmz unsafe safe
-	iface eth2 safe
-	iface eth3 untrusted
+	hosttype router
+	iface eth0 dmz unsafe safe untrusted vpn sgo colobdry default
+	iface eth1 dmz unsafe safe untrusted vpn sgo colobdry default
+	iface eth2 dmz unsafe safe untrusted vpn sgo colobdry
+	iface eth3 untrusted vpn default
+	iface t6-he default
+	iface vpn-precision colobdry vpn sgo
+	iface vpn-chiark sgo
+	iface vpn-+ vpn
 defhost roadstar
 	iface eth0 dmz unsafe
 	iface eth1 dmz unsafe
@@ -83,22 +87,26 @@ defhost jem
 	iface eth0 dmz unsafe
 	iface eth1 dmz unsafe
 defhost artist
+	hosttype router
 	iface eth0 dmz unsafe
 	iface eth1 dmz unsafe
+	iface eth3 untrusted
 defhost vampire
-	router
-	iface eth0.0 dmz unsafe safe
-	iface eth0.1 dmz unsafe safe
-	iface eth0.2 safe
-	iface eth0.3 untrusted
-	iface dns0 dns
+	hosttype router
+	iface eth0.4 dmz unsafe untrusted safe vpn sgo colobdry
+	iface eth0.5 dmz unsafe untrusted safe vpn sgo colobdry
+	iface eth0.6 dmz unsafe safe untrusted vpn sgo colobdry
+	iface eth0.7 untrusted
+	iface dns0 iodine
+	iface vpn-precision colobdry vpn sgo
+	iface vpn-chiark sgo
 	iface vpn-+ vpn
-	iface vpn-precision colobdry vpn
 defhost ibanez
 	iface br-dmz dmz unsafe
 	iface br-unsafe unsafe
 
 defhost gibson
+	hosttype client
 	iface eth0 unsafe
 
 ## Colocated networks.
@@ -119,11 +127,12 @@ defhost fender
 	iface br-jump jump colo
 	iface br-colo jump colo
 defhost precision
-	router
-	iface eth0 jump colo
-	iface eth1 jump colo
+	hosttype router
+	iface eth0 jump colo sgo
+	iface eth1 jump colo sgo
+	iface vpn-radius housebdry vpn sgo
+	iface vpn-chiark sgo
 	iface vpn-+ vpn
-	iface vpn-vampire housebdry vpn
 defhost telecaster
 	iface eth0 jump colo
 	iface eth1 jump colo
@@ -137,6 +146,12 @@ defhost jazz
 ## Other networks.
 defnet hub virtual
 	forwards housebdry colobdry
+defnet sgo noloop
+	addr !172.29.198.0/23
+	addr 10.0.0.0/8
+	addr 172.16.0.0/12
+	addr 192.168.0.0/16
+	forwards househub colohub
 defnet vpn safe
 	addr 172.29.199.128/27 2001:ba8:1d9:6000::/64
 	forwards househub colohub
@@ -185,17 +200,10 @@ case $forward in
 	    -m state --state ESTABLISHED
 
     ## Allow SSH from safe/noloop to untrusted networks.
-    run iptables -A fwd-spec-nofrag -j ACCEPT \
+    run ip46tables -A fwd-spec-nofrag -j ACCEPT \
 	    -p tcp --destination-port $port_ssh \
 	    -m mark --mark $to_untrusted/$MASK_TO
-    run iptables -A fwd-spec-nofrag -j ACCEPT \
-	    -p tcp --source-port $port_ssh \
-	    -m mark --mark $from_untrusted/$MASK_FROM \
-	    -m state --state ESTABLISHED
-    run ip6tables -A fwd-spec-nofrag -j ACCEPT \
-	    -p tcp --destination-port $port_ssh \
-	    -m mark --mark $to_untrusted/$MASK_TO
-    run ip6tables -A fwd-spec-nofrag -j ACCEPT \
+    run ip46tables -A fwd-spec-nofrag -j ACCEPT \
 	    -p tcp --source-port $port_ssh \
 	    -m mark --mark $from_untrusted/$MASK_FROM \
 	    -m state --state ESTABLISHED