X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/f409e9c51d0c20dd45bc70cf2dbf0d8a9a0748e7..664e6cf95b818fd519f19fa22769072e79cfd5eb:/hosts.lisp?ds=sidebyside

diff --git a/hosts.lisp b/hosts.lisp
index e8f253e..8576a0b 100644
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -22,7 +22,8 @@ (defhost gandi-ns6 ((:ipv4 "217.70.177.40")))
 (defnet distorted.org.uk "172.29.198/23"
   (untrusted "198.0/24"
     (wireless "0/25")
-    (iodine "128/28"))
+    (iodine "128/28")
+    (upn "160/27"))
   (trusted "199.0/24"
     (wired "0/25"
       (unsafe "0/27")
@@ -42,7 +43,8 @@ (defnet jump "2001:ba8:0:1d9/64")
 (defnet distorted.org.uk-jump "2001:ba8:1d9/48"
   (colo "2/64")
   (any "0/64")
-  (vpn "6000/64"))
+  (vpn "6000/64")
+  (upn "a000/64"))
 
 ;; Hurricane Electric IPv6-inIPv4 tunnel.
 (defnet he-tunnel "2001:470:1f08:1b98/64")
@@ -62,6 +64,7 @@ (defhost roadstar.dmz (dmz 3))
 (defhost jem.dmz (dmz 4))
 (defhost artist.dmz (dmz 5))
 (defhost vampire.dmz (dmz 6))
+(defhost universe.dmz (dmz 7))
 (defhost ibanez.dmz (dmz 9))
 (defhost anon.dmz (dmz 12))
 (defhost nat.dmz ((:ipv4 dmz 14)))
@@ -78,28 +81,36 @@ (defhost richmond.jump ((:ipv4 jump 12) (:ipv6 jump "::1:1")))
 (defhost anon.jump (jump 13))
 (defhost blackhole.jump ((:ipv4 jump 14) (:ipv6 jump "::ffff")))
 
+;; Linode virtual hosts.
+(defhost national.linode ((:ipv4 "45.33.118.239")
+			  (:ipv6 "2600:3c00::f03c:91ff:fe3b:d7c1")))
+
 ;; Unsafe network.
 (defhost radius.unsafe (unsafe 1))
 (defhost roadstar.unsafe (unsafe 2))
 (defhost jem.unsafe (unsafe 3))
 (defhost artist.unsafe (unsafe 4))
 (defhost vampire.unsafe (unsafe 5))
+(defhost universe.unsafe (unsafe 6))
 (defhost ibanez.unsafe (unsafe 14))
 (defhost groove.unsafe (unsafe 17))
 
 ;; Client hosts, with IPv6 addresses.
 (defhost gibson.unsafe ((:ipv6 "2001:470:9740:1:e269:95ff:fe63:bb4")))
-(defhost lespaul.safe ((:ipv6 "2001:470:9740:4001:a00:27ff:fef5:aaef")))
+(defhost crybaby.unsafe ((:ipv6 "2001:470:9740:1:216:eaff:fec2:4cb8")))
+(defhost lespaul.unsafe ((:ipv6 "2001:470:9740:1:a00:27ff:fef5:aaef")))
+(defhost haze.unsafe ((:ipv6 "2001:470:9740:1:5056:a8ff:fe01:5654")))
+(defhost gretsch.unsafe ((:ipv6 "2001:470:9740:1:3a2c:4aff:fe6d:e768")))
 (defhost invader.safe ((:ipv6 "2001:470:9740:4001:a00:27ff:fe94:a5d7")))
 (defhost marauder.safe ((:ipv6 "2001:470:9740:4001:a00:27ff:fe6a:7846")))
 
 ;; Safe network.
 (defhost radius.safe (safe 1))
 (defhost vampire.safe (safe 2))
-(defhost evolution.safe ((:ipv4 safe 3)))
-(defhost tp0.safe (safe 4))
-(defhost tp1.safe (safe 5))
-(defhost tp2.safe (safe 6))
+(defhost evolution.safe (safe 3))
+(defhost grigsby.safe (safe 4))
+(defhost carling.safe (safe 5))
+(defhost tritan.safe (safe 6))
 
 ;; Wireless network.
 (defhost radius.untrusted (untrusted 1))
@@ -111,6 +122,13 @@ (defhost crybaby.vpn ((:ipv4 vpn 1) (:ipv6 vpn "::1:1")))
 (defhost terror.vpn ((:ipv4 vpn 2)))
 (defhost orange.vpn ((:ipv4 vpn 3) (:ipv6 vpn "::3:1")))
 (defhost haze.vpn ((:ipv4 vpn 4) (:ipv6 vpn "::4:1")))
+(defhost radius.vpn ((:ipv4 vpn 5) (:ipv6 vpn "::5:1")))
+(defhost precision.vpn ((:ipv4 vpn 6) (:ipv6 vpn "::6:1")))
+(defhost jazz.vpn ((:ipv4 vpn 7) (:ipv6 vpn "::7:1")))
+(defhost vampire.vpn ((:ipv4 vpn 8) (:ipv6 vpn "::8:1")))
+
+;; Untrusted private network.
+(defhost national.upn ((:ipv4 upn 1) (:ipv6 upn "::1:1")))
 
 ;; Iodine network.
 (defhost jazz.iodine (iodine 1))