X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/775bd287d2eda80ffde35b067429c93223c41bbf..960a999671b6958a40f71e68316d41402521957c:/vampire.m4

diff --git a/vampire.m4 b/vampire.m4
index 6dc3710..b3257c7 100644
--- a/vampire.m4
+++ b/vampire.m4
@@ -22,22 +22,9 @@
 ### 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 \
@@ -58,22 +45,17 @@ allowservices inbound udp \
 	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 \
+	netbios_ssn microsoft_ds
+allowservices inbound-untrusted udp \
+	dns \
+	tftp
 
 ## Provide syslog for evolution.
 run iptables -A inbound -j ACCEPT \
@@ -86,7 +68,7 @@ run iptables -A OUTPUT -m multiport \
 
 ## Other interesting things.
 dnsresolver inbound
-ntpclient inbound 158.152.1.76 158.152.1.204 194.159.253.2
+ntpclient inbound $ntp_servers
 
 m4_divert(-1)
 ###----- That's all, folks --------------------------------------------------