classify.m4: Clean up interface map tracing.

[firewall] / local.m4

diff --git a/local.m4 b/local.m4
index 5b0360a..45e498b 100644 (file)
--- a/local.m4
+++ b/local.m4
@@ -60,8 +60,6 @@ defnet safe safe
 defnet untrusted untrusted
        addr 172.29.198.0/25 2001:470:9740:8001::/64
        forwards househub
-defnet iodine untrusted
-       addr 172.29.198.128/28
 
 defnet househub virtual
        forwards housebdry dmz unsafe safe untrusted
@@ -71,11 +69,16 @@ 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 ppp0 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 +86,25 @@ defhost jem
        iface eth0 dmz unsafe
        iface eth1 dmz unsafe
 defhost artist
-       iface eth0 dmz unsafe
-       iface eth1 dmz unsafe
+       hosttype router
+       iface eth0 dmz unsafe untrusted
+       iface eth1 dmz unsafe untrusted
+       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 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.
@@ -109,21 +115,25 @@ defnet colo trusted
        addr 172.29.199.176/28 2001:ba8:1d9:2::/64
        forwards colohub
 defnet colohub virtual
-       forwards colobdry jump colo
+       forwards colobdry jump colo iodine
 defnet colobdry virtual
        forwards colohub hub
        noxit jump
+defnet iodine untrusted
+       addr 172.29.198.128/28
+       forwards colohub
 
 ## Colocated hosts.
 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
@@ -133,20 +143,30 @@ defhost stratocaster
 defhost jazz
        iface eth0 jump colo
        iface eth1 jump colo
+       iface dns0 iodine
 
 ## 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
        host crybaby 1
        host terror 2
+defnet anycast trusted
+       addr 172.29.199.224/27 2001:ba8:1d9:0::/64
+       forwards dmz unsafe safe untrusted jump colo vpn
 defnet default untrusted
        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
+       forwards dmz unsafe untrusted jump colo
 
 m4_divert(80)m4_dnl
 ###--------------------------------------------------------------------------
@@ -182,17 +202,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