X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/9b7e40695ec633ee206dd608a3a7e0e410e5f7c8..113bdffe71e1ece0c16a2e7c73d0f568b16be789:/hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index da03f74..28dd2bf 100644
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -5,7 +5,7 @@
 ;;;--------------------------------------------------------------------------
 ;;; External hosts.
 
-(defhost boyle.nsict.org "85.158.42.162")
+(defhost boyle.nsict.org ((:ipv4 "85.158.42.162")))
 (defhost chiark.greenend.org.uk ((:ipv4 "212.13.197.229")
 				 (:ipv6 "2001:ba8:1e3::")))
 (defhost mccoy.flatline.org.uk "80.74.241.31")
@@ -13,7 +13,7 @@
 		     (:ipv6 "2600:3c00::f03c:91ff:fe96:beac")))
 (defhost mythic-ns2 ((:ipv4 "93.93.128.67")
 		     (:ipv6 "2a00:1098:0:80:1000::10")))
-(defhost gandi-ns6 "217.70.177.40")
+(defhost gandi-ns6 ((:ipv4 "217.70.177.40")))
 
 ;;;--------------------------------------------------------------------------
 ;;; Internal addresses.
@@ -76,7 +76,7 @@
 (defhost jaguar.jump ((:ipv4 jump 11)))
 (defhost richmond.jump ((:ipv4 jump 12)))
 (defhost anon.jump (jump 13))
-(defhost blackhole.jump ((:ipv4 jump 14) (:ipv6 jump #xffff)))
+(defhost blackhole.jump ((:ipv4 jump 14) (:ipv6 jump "::ffff")))
 
 ;; Unsafe network.
 (defhost radius.unsafe (unsafe 1))
@@ -86,6 +86,12 @@
 (defhost vampire.unsafe (unsafe 5))
 (defhost ibanez.unsafe (unsafe 14))
 
+;; 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 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))
@@ -97,9 +103,9 @@
 (defhost vampire.untrusted (untrusted 3))
 
 ;; Virtual private network.
-(defhost crybaby.vpn (vpn 1))
+(defhost crybaby.vpn ((:ipv4 vpn 1) (:ipv6 vpn "::1:0")))
 (defhost terror.vpn ((:ipv4 vpn 2)))
-(defhost orange.vpn (vpn 3))
+(defhost orange.vpn ((:ipv4 vpn 3) (:ipv6 vpn "::3:0")))
 
 ;; Iodine network.
 (defhost jazz.iodine (iodine 1))
@@ -117,13 +123,13 @@
 (defhost jazz.colo (colo 5))
 
 ;; Anycast addresses for services.
-(defhost dns0.any (any 0))
-(defhost dns1.any (any 1))
-(defhost ntp0.any (any 2))
-(defhost ntp1.any (any 3))
-(defhost www-cache.any (any 4))
-(defhost krb0.any (any 5))
-(defhost krb1.any (any 6))
+(defhost dns0.any ((:ipv4 any 0) (:ipv6 any "::0:0")))
+(defhost dns1.any ((:ipv4 any 1) (:ipv6 any "::1:0")))
+(defhost ntp0.any ((:ipv4 any 2) (:ipv6 any "::2:0")))
+(defhost ntp1.any ((:ipv4 any 3) (:ipv6 any "::3:0")))
+(defhost www-cache.any ((:ipv4 any 4) (:ipv6 any "::4:0")))
+(defhost krb0.any ((:ipv4 any 5) (:ipv6 any "::5:0")))
+(defhost krb1.any ((:ipv4 any 6) (:ipv6 any "::6:0")))
 
 ;;;--------------------------------------------------------------------------
 ;;; Host switch.
@@ -132,11 +138,13 @@
   ((unsafe colo)
    (defhost radius radius.unsafe)
    (defhost precision precision.colo)
+   (defhost telecaster telecaster.colo)
    (defhost stratocaster stratocaster.colo)
    (defhost vampire vampire.unsafe))
   (t
    (defhost radius radius.dmz)
    (defhost precision precision.jump)
+   (defhost telecaster telecaster.jump)
    (defhost stratocaster stratocaster.jump)
    (defhost vampire vampire.dmz)))