X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/12ac65a1e0d1d8083bdbf50154248a0c5110a2b2..a3972fea9c58e172fb2a1c1dc7362ec6a40fa4bd:/local.m4

diff --git a/local.m4 b/local.m4
index 27caa44..b9fa700 100644
--- a/local.m4
+++ b/local.m4
@@ -1,4 +1,4 @@
-### -*-m4-*-
+### -*-sh-*-
 ###
 ### Local firewall configuration
 ###
@@ -63,6 +63,15 @@ run iptables -A FORWARD -j ACCEPT \
 	-p icmp ! -f --icmp-type echo-reply \
 	-m mark --mark $from_untrusted/$MASK_FROM \
 	-m state --state ESTABLISHED
+run ip6tables -A FORWARD -j ACCEPT \
+	-p ipv6-icmp --icmpv6-type echo-request \
+	-m ipv6header --soft ! --header frag \
+	-m mark --mark $to_untrusted/$MASK_TO
+run ip6tables -A FORWARD -j ACCEPT \
+	-p ipv6-icmp --icmpv6-type echo-reply \
+	-m ipv6header --soft ! --header frag \
+	-m mark --mark $from_untrusted/$MASK_FROM \
+	-m state --state ESTABLISHED
 
 ## Allow SSH from safe/noloop to untrusted networks.
 run iptables -A FORWARD -j ACCEPT \
@@ -72,6 +81,30 @@ run iptables -A FORWARD -j ACCEPT \
 	-p tcp ! -f --source-port $port_ssh \
 	-m mark --mark $from_untrusted/$MASK_FROM \
 	-m state --state ESTABLISHED
+run ip6tables -A FORWARD -j ACCEPT \
+	-p tcp --destination-port $port_ssh \
+	-m ipv6header --soft ! --header frag \
+	-m mark --mark $to_untrusted/$MASK_TO
+run ip6tables -A FORWARD -j ACCEPT \
+	-p tcp --source-port $port_ssh \
+	-m ipv6header --soft ! --header frag \
+	-m mark --mark $from_untrusted/$MASK_FROM \
+	-m state --state ESTABLISHED
+
+m4_divert(60)m4_dnl
+###--------------------------------------------------------------------------
+### Kill things we don't understand properly.
+###
+### I don't like having to do this, but since I don't know how to do proper
+### multicast filtering, I'm just going to ban it from being forwarded.
+
+errorchain poorly-understood REJECT
+
+## Ban multicast destination addresses in forwarding.
+run iptables -A FORWARD -g poorly-understood \
+	-d 224.0.0.0/4
+run ip6tables -A FORWARD -g poorly-understood \
+	-d ff::/8
 
 m4_divert(80)m4_dnl
 ###--------------------------------------------------------------------------
@@ -93,19 +126,19 @@ run iptables -A inbound -j ACCEPT \
 	-p udp --source-port $port_bootpc --destination-port $port_bootps
 
 ## Allow incoming ping.  This is the only ICMP left.
-run iptables -A inbound -j ACCEPT -p icmp
+run ip46tables -A inbound -j ACCEPT -p icmp
 
 m4_divert(88)m4_dnl
 ## Allow unusual things.
 openports inbound
 
 ## Inspect inbound packets from untrusted sources.
-run iptables -A inbound -j forbidden
-run iptables -A INPUT -m mark --mark $from_untrusted/$MASK_FROM -g inbound
+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.
 for i in INPUT FORWARD; do
-  run iptables -A $i -m mark ! --mark 0/$MASK_MASK -j ACCEPT
+  run ip46tables -A $i -m mark ! --mark 0/$MASK_MASK -j ACCEPT
 done
 
 m4_divert(-1)