X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/b9e891b5acc222946f8e44f7c977f3c10232a188..2f8634360a143effa8f6fc1b4e6854b965ffa867:/local.m4 diff --git a/local.m4 b/local.m4 index 42ef732..251cf59 100644 --- a/local.m4 +++ b/local.m4 @@ -53,7 +53,7 @@ defnet unsafe trusted addr 172.29.199.0/25 2001:470:9740:1::/64 forwards househub defnet safe safe - addr 172.29.199.192/28 2001:470:9740:4001::/64 + addr 172.29.199.192/27 2001:470:9740:4001::/64 forwards househub defnet untrusted untrusted addr 172.29.198.0/25 2001:470:9740:8001::/64 @@ -161,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 \ @@ -172,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 @@ -264,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 --------------------------------------------------