X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/f98dfdf667181aad1d53a6e3a3758c2c6caec3a8..77e84a029d77f4bc169f90fd888342762f5af0e5:/local.m4

diff --git a/local.m4 b/local.m4
index 52dc94c..0d38497 100644
--- a/local.m4
+++ b/local.m4
@@ -38,17 +38,18 @@ m4_divert(-1)m4_dnl
 m4_divert(46)m4_dnl
 ## Networks and routing.
 
-defiface $if_trusted \
-	trusted:172.29.199.0/26 \
-	safe:172.29.199.64/27 \
-	untrusted:default
 defiface $if_untrusted \
 	untrusted:172.29.198.0/25
 defvpn $if_vpn safe 172.29.199.128/27 \
-	crybaby:172.29.199.129
+	crybaby:172.29.199.129 \
+	terror:172.29.199.130
 defiface $if_iodine untrusted:172.29.198.128/28
 defiface $if_its_mz safe:172.29.199.160/30
 defiface $if_its_pi safe:192.168.0.0/24
+defiface $if_trusted \
+	trusted:172.29.199.0/26 \
+	safe:172.29.199.64/27 \
+	untrusted:default
 
 m4_divert(60)m4_dnl
 ###--------------------------------------------------------------------------
@@ -56,19 +57,19 @@ m4_divert(60)m4_dnl
 
 ## Allow ping from safe/noloop to untrusted networks.
 run iptables -A FORWARD -j ACCEPT \
-	-p icmp --icmp-type echo-request \
+	-p icmp ! -f --icmp-type echo-request \
 	-m mark --mark $to_untrusted/$MASK_TO
 run iptables -A FORWARD -j ACCEPT \
-	-p icmp --icmp-type echo-reply \
+	-p icmp ! -f --icmp-type echo-reply \
 	-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 \
-    	-p tcp --destination-port $port_ssh \
+    	-p tcp ! -f --destination-port $port_ssh \
 	-m mark --mark $to_untrusted/$MASK_TO
 run iptables -A FORWARD -j ACCEPT \
-	-p tcp --source-port $port_ssh \
+	-p tcp ! -f --source-port $port_ssh \
 	-m mark --mark $from_untrusted/$MASK_FROM \
 	-m state --state ESTABLISHED
 
@@ -79,6 +80,7 @@ m4_divert(80)m4_dnl
 clearchain inbound
 
 ## Track connections.
+commonrules inbound
 conntrack inbound
 
 ## Allow incoming bootp.  Bootp won't be forwarded, so this is obviously a