X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/firewall/blobdiff_plain/d84128ea08ab3f1af3d2d25907ee18e2edf0283a..5cadbadd50ffea824e5eb450d4de1c6f45dd173f:/vampire.m4?ds=inline

diff --git a/vampire.m4 b/vampire.m4
index e378447..34d5fde 100644
--- a/vampire.m4
+++ b/vampire.m4
@@ -21,36 +21,13 @@
 ### along with this program; if not, write to the Free Software Foundation,
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-###--------------------------------------------------------------------------
-### Config settings.
-
-## This router is involved in a routing asymmetry.
-setconf(rp_filter, 0)
-setconf(log_martians, 0)
-
-###--------------------------------------------------------------------------
-### Network interfaces.
-
-m4_divert(44)m4_dnl
-## Interface definitions.
-if_dmz=eth0.0
-if_trusted=eth0.1
-if_safe=$if_dmz,$if_trusted
-if_untrusted=eth0.3
-if_vpn=vpn-+
-if_iodine=dns+
-if_its_mz=$if_dmz,$if_trusted
-if_its_pi=$if_dmz,$if_trusted
-
-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 \
 	ssh \
 	smtp submission \
 	gnutella_svc \
@@ -62,18 +39,18 @@ allowservices inbound tcp \
 	git \
 	tor_public tor_directory i2p
 allowservices inbound udp \
-	dns iodine \
 	tripe \
 	gnutella_svc \
 	i2p
 
 ## Extend some services to local untrusted hosts.
 clearchain inbound-untrusted
-run iptables -A inbound -j inbound-untrusted \
-	-s 172.29.198.0/24
+run iptables -A inbound -j inbound-untrusted -s $net_inet_untrusted
+run ip6tables -A inbound -j inbound-untrusted -s $net_inet6_untrusted
 
 allowservices inbound-untrusted tcp \
 	dns \
+	lpd \
 	netbios_ssn microsoft_ds
 allowservices inbound-untrusted udp \
 	dns \
@@ -90,6 +67,7 @@ run iptables -A OUTPUT -m multiport \
 
 ## Other interesting things.
 dnsresolver inbound
+dnsserver inbound
 ntpclient inbound $ntp_servers
 
 m4_divert(-1)