(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")
(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")
(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))
;; 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))
(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))