X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/36549b8b973f43892f1316919440a94b358a981b..f01cdc79f93706687fab5a412f0f5b504e5f4431:/local.m4

diff --git a/local.m4 b/local.m4
index 7cda718..b0a4e4c 100644
--- a/local.m4
+++ b/local.m4
@@ -43,6 +43,10 @@ m4_divert(-1)
 ##		House border network (dmz).  We have all of these, but .145
 ##		is reserved for the router.
 ##
+## 81.2.113.195, 81.187.238.128/28
+##		House border network (aaisp).  We have all of these; the
+##		loose address is for the router.
+##
 ## 212.13.18.64/28
 ##		Jump colocated network (jump).  .65--68 are used by Jump
 ##		network infrastructure; we get the rest.
@@ -54,6 +58,7 @@ m4_divert(-1)
 ## 172.29.198.0/24  Untrusted networks.
 ##	.0/25		house wireless net
 ##	.128/28		iodine (IP-over-DNS) network
+##	.160/27		untrusted virtual network
 ##
 ## 172.29.199.0/24  Trusted networks.
 ##	.0/25		house wired network
@@ -78,6 +83,10 @@ m4_divert(-1)
 ## 2001:470:9740::/48
 ##		Main house range.  See below for allocation policy.
 ##
+## 2001:8b0:c92::/48
+##		Main house range (aaisp).  See below for allocation policy.
+##		There is no explicit DMZ allocation (and no need for one).
+##
 ## 2001:ba8:0:1d9::/64
 ##		Jump border network (jump): :1 is the router (supplied by
 ##		Jump); other addresses are ours.
@@ -89,6 +98,7 @@ m4_divert(-1)
 ## The /48s are split into /64s by appending a 16-bit network number.  The
 ## top nibble of the network number classifies the network, as follows.
 ##
+## axxx		Virtual, untrusted
 ## 8xxx		Untrusted
 ## 6xxx		Virtual, safe
 ## 4xxx		Safe
@@ -112,7 +122,7 @@ m4_divert(-1)
 
 ## Define the available network classes.
 m4_divert(42)m4_dnl
-defnetclass scary	scary 		trusted		    mcast
+defnetclass scary	scary		trusted		    mcast
 defnetclass untrusted	scary untrusted trusted		    mcast
 defnetclass trusted	scary untrusted trusted safe noloop mcast
 defnetclass safe			trusted safe noloop mcast
@@ -129,6 +139,7 @@ m4_divert(26)m4_dnl
 ## House networks.
 defnet dmz trusted
 	addr 62.49.204.144/28 2001:470:1f09:1b98::/64
+	addr 81.2.113.195 81.187.238.128/28 2001:8b0:c92::/48
 	via unsafe untrusted
 defnet unsafe trusted
 	addr 172.29.199.0/25 2001:470:9740:1::/64
@@ -163,6 +174,9 @@ defhost roadstar
 defhost jem
 	iface eth0 dmz unsafe
 	iface eth1 dmz unsafe
+defhost universe
+	iface eth0 dmz unsafe
+	iface eth1 dmz unsafe
 defhost artist
 	hosttype router
 	iface eth0 dmz unsafe untrusted
@@ -190,7 +204,7 @@ defhost groove
 
 defhost gibson
 	hosttype client
-	iface eth0 unsafe
+	iface eth0.5 unsafe
 
 ## Colocated networks.
 defnet jump trusted
@@ -218,6 +232,7 @@ defhost precision
 	iface vpn-mango binswood
 	iface vpn-radius housebdry vpn sgo
 	iface vpn-chiark sgo
+	iface vpn-national upn
 	iface vpn-+ vpn
 defhost telecaster
 	iface eth0 jump colo
@@ -257,12 +272,20 @@ defnet default scary
 	addr 212.13.198.64/28 2001:ba8:0:1d9::/64
 	addr 2001:ba8:1d9::/48 #temporary
 	via dmz unsafe untrusted jump colo
+defnet upn untrusted
+	addr 172.29.198.160/27 2001:ba8:1d9:a000::/64
+	via colohub
+	host national 1 ::1:1
+
+## Linode hosts.
+defhost national
+	iface eth0 default
+	iface vpn-precision colohub
 
 ## Satellite networks.
 defnet binswood noloop
 	addr 10.165.27.0/24
 	via colohub
-
 defhost mango
 	hosttype router
 	iface eth0 binswood default
@@ -360,7 +383,8 @@ 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 ip46tables -A inbound -j ACCEPT -p icmp
+run iptables -A inbound -j ACCEPT -p icmp
+run ip6tables -A inbound -j ACCEPT -p icmpv6
 
 m4_divert(88)m4_dnl
 ## Allow unusual things.