functions.m4: The mark-{from,to}-* rules no longer own the packet marks.

[firewall] / local.m4

diff --git a/local.m4 b/local.m4
index f2b2b9c..251cf59 100644 (file)
--- 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
@@ -75,8 +75,8 @@ defnet housebdry virtual
 ## House hosts.
 defhost radius
        router
-       iface eth0 dmz unsafe
-       iface eth1 dmz unsafe
+       iface eth0 dmz unsafe safe
+       iface eth1 dmz unsafe safe
        iface eth2 safe
        iface eth3 untrusted
 defhost roadstar
@@ -90,8 +90,9 @@ defhost artist
        iface eth1 dmz unsafe
 defhost vampire
        router
-       iface eth0.0 dmz unsafe
-       iface eth0.1 dmz unsafe
+       iface eth0.0 dmz unsafe safe
+       iface eth0.1 dmz unsafe safe
+       iface eth0.2 safe
        iface eth0.3 untrusted
        iface dns0 dns
        iface vpn-+ vpn
@@ -105,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
@@ -140,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
@@ -159,7 +161,7 @@ case $forward in
     run iptables -A fwd-spec-nofrag -j RETURN --fragment
     run ip6tables -A fwd-spec-nofrag -j RETURN \
            -m ipv6header --soft --header frag
-    run iptables -A FORWARD -j fwd-spec-nofrag
+    run ip46tables -A FORWARD -j fwd-spec-nofrag
 
     ## Allow ping from safe/noloop to untrusted networks.
     run iptables -A fwd-spec-nofrag -j ACCEPT \
@@ -170,10 +172,10 @@ case $forward in
            -m mark --mark $from_untrusted/$MASK_FROM \
            -m state --state ESTABLISHED
     run ip6tables -A fwd-spec-nofrag -j ACCEPT \
-           -p ipv6-icmp --icmpv6-type echo-request \
+           -p icmpv6 --icmpv6-type echo-request \
            -m mark --mark $to_untrusted/$MASK_TO
     run ip6tables -A fwd-spec-nofrag -j ACCEPT \
-           -p ipv6-icmp --icmpv6-type echo-reply \
+           -p icmpv6 --icmpv6-type echo-reply \
            -m mark --mark $from_untrusted/$MASK_FROM \
            -m state --state ESTABLISHED
 
@@ -262,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 --------------------------------------------------