X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/c1f47051f1cb6a87b67ad33d86059d85574f17fc..c32d96fac6d653c70d82990fdf17a0c885b65f7a:/hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index fe62bfe..7463af1 100644
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -73,7 +73,7 @@
 (defhost telecaster.jump (jump 7))
 (defhost stratocaster.jump (jump 8))
 (defhost jazz.jump (jump 9))
-(defhost jaguar.jump ((:ipv4 jump 11)))
+(defhost jaguar.jump ((:ipv4 jump 11) (:ipv6 jump "::2:1")))
 (defhost richmond.jump ((:ipv4 jump 12) (:ipv6 jump "::1:1")))
 (defhost anon.jump (jump 13))
 (defhost blackhole.jump ((:ipv4 jump 14) (:ipv6 jump "::ffff")))
@@ -85,9 +85,11 @@
 (defhost artist.unsafe (unsafe 4))
 (defhost vampire.unsafe (unsafe 5))
 (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 crybaby.unsafe ((:ipv6 "2001:470:9740:1:216:eaff:fec2:4cb8")))
 (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")))
@@ -95,7 +97,10 @@
 ;; Safe network.
 (defhost radius.safe (safe 1))
 (defhost vampire.safe (safe 2))
-(defhost evolution.safe ((:ipv4 safe 3)))
+(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))
@@ -103,9 +108,14 @@
 (defhost vampire.untrusted (untrusted 3))
 
 ;; Virtual private network.
-(defhost crybaby.vpn ((:ipv4 vpn 1) (:ipv6 vpn "::1:0")))
+(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:0")))
+(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")))
 
 ;; Iodine network.
 (defhost jazz.iodine (iodine 1))
@@ -123,13 +133,13 @@
 (defhost jazz.colo (colo 5))
 
 ;; Anycast addresses for services.
-(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")))
+(defhost dns0.any ((:ipv4 any 0) (:ipv6 any "::0:1")))
+(defhost dns1.any ((:ipv4 any 1) (:ipv6 any "::1:1")))
+(defhost ntp0.any ((:ipv4 any 2) (:ipv6 any "::2:1")))
+(defhost ntp1.any ((:ipv4 any 3) (:ipv6 any "::3:1")))
+(defhost www-cache.any ((:ipv4 any 4) (:ipv6 any "::4:1")))
+(defhost krb0.any ((:ipv4 any 5) (:ipv6 any "::5:1")))
+(defhost krb1.any ((:ipv4 any 6) (:ipv6 any "::6:1")))
 
 ;;;--------------------------------------------------------------------------
 ;;; Host switch.
@@ -148,4 +158,6 @@
    (defhost stratocaster stratocaster.jump)
    (defhost vampire vampire.dmz)))
 
+(defhost jaguar jaguar.jump)
+
 ;;;----- That's all, folks --------------------------------------------------