X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/1ee6211dcd0063197621004e6c7073bd801b8efe..8670c87d52da8c68fa8fb99ff1d4976d4a72675a:/vampire.m4

diff --git a/vampire.m4 b/vampire.m4
index f6f5d46..ed9bd9b 100644
--- a/vampire.m4
+++ b/vampire.m4
@@ -22,58 +22,31 @@
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 ###--------------------------------------------------------------------------
-### Network interfaces.
-
-m4_divert(44)m4_dnl
-## Interface definitions.
-if_untrusted=eth0.1
-if_trusted=eth0.0
-if_vpn=vpn-+
-if_iodine=dns+
-if_its_mz=eth0.0
-if_its_pi=eth0.0
-
-m4_divert(-1)
-###--------------------------------------------------------------------------
 ### vampire-specific rules.
 
-m4_divert(82)m4_dnl
+m4_divert(86)m4_dnl
 ## Externally visible services.
 allowservices inbound tcp \
-	finger ident \
-	dns iodine \
+	ident \
 	ssh \
-	smtp submission \
-	gnutella_svc \
-	ftp ftp_data \
-	rsync \
-	imaps \
-	disorder mpd \
-	http https squid \
-	git \
 	tor_public tor_directory i2p
 allowservices inbound udp \
-	dns iodine \
 	tripe \
 	gnutella_svc \
 	i2p
 
-## Provide DNS resolution to local untrusted hosts.
-for p in tcp udp; do
-  run iptables -A inbound -j ACCEPT \
-	  -s 172.29.198.0/24 \
-	  -p $p --destination-port $port_dns
-done
+## Extend some services to local untrusted hosts.
+clearchain inbound-untrusted
+run iptables -A inbound -j inbound-untrusted -s $net_inet_untrusted
+run ip6tables -A inbound -j inbound-untrusted -s $net_inet6_untrusted
 
-## Allow smb and nmb to untrusted hosts.  This is a bit experimental.
-run iptables -A inbound -j ACCEPT \
-	-s 172.29.198.0/24 \
-	-p udp -m multiport --destination-ports \
-		$port_netbios_ns,$port_netbios_dgm
-run iptables -A inbound -j ACCEPT \
-	-s 172.29.198.0/24 \
-	-p tcp -m multiport --destination-ports \
-		$port_netbios_ssn,$port_microsoft_ds
+allowservices inbound-untrusted tcp \
+	dns \
+	lpd \
+	netbios_ssn microsoft_ds
+allowservices inbound-untrusted udp \
+	dns \
+	tftp
 
 ## Provide syslog for evolution.
 run iptables -A inbound -j ACCEPT \
@@ -86,7 +59,16 @@ run iptables -A OUTPUT -m multiport \
 
 ## Other interesting things.
 dnsresolver inbound
+dnsserver inbound
 ntpclient inbound $ntp_servers
 
+## Provide NTP service to untrusted clients.
+iptables -A inbound -p udp -j ACCEPT \
+	--source-port 123 --destination-port 123 \
+	-s 172.29.198.0/23
+ip6tables -A inbound -p udp -j ACCEPT \
+	--source-port 123 --destination-port 123 \
+	-s 2001:470:9740::/48
+
 m4_divert(-1)
 ###----- That's all, folks --------------------------------------------------