hosts.lisp, distorted.lisp: New `blackhole' address.

[zones] / hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index 8fc9924df9ae4000324e6f6ceca04bb21e3d4ff3..003fe5ef6e58426d1965832b1aaa818f826407ae 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -29,11 +29,12 @@ (defnet distorted.org.uk 172.29.198.0/23
     (wired 128
       (unsafe 32)
       (dhcp 32))
-    (virtual 32)
+    (vpn 32)
     (nil 16
       (its 4))
     (colo 16)
-    (safe 32)))
+    (safe 32)
+    (any 32)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Host allocations
@@ -46,6 +47,7 @@ (defhost jem.dmz (dmz 4))
 (defhost artist.dmz (dmz 5))
 (defhost vampire.dmz (dmz 6))
 (defhost ibanez.dmz (dmz 9))
+(defhost iodine.dmz (dmz 11))
 (defhost anon.dmz (dmz 12))
 (defhost gate.dmz (dmz 13))
 (defhost nat.dmz (dmz 14))
@@ -56,6 +58,7 @@ (defhost precision.jump (jump 6))
 (defhost telecaster.jump (jump 7))
 (defhost stratocaster.jump (jump 8))
 (defhost jazz.jump (jump 9))
+(defhost blackhole.jump (jump 14))
 
 ;; Unsafe network.
 (defhost radius.unsafe (unsafe 1))
@@ -76,8 +79,8 @@ (defhost evolution.untrusted (untrusted 2))
 (defhost vampire.untrusted (untrusted 3))
 
 ;; Virtual private network.
-(defhost crybaby.virtual (virtual 1))
-(defhost terror.virtual (virtual 2))
+(defhost crybaby.vpn (vpn 1))
+(defhost terror.vpn (vpn 2))
 
 ;; Iodine network.
 (defhost vampire.iodine (iodine 1))
@@ -94,15 +97,22 @@ (defhost telecaster.colo (colo 3))
 (defhost stratocaster.colo (colo 4))
 (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))
+
 ;;;--------------------------------------------------------------------------
 ;;; Host switch.
 
 (preferred-subnet-case
-  (dmz
-   (defhost radius radius.dmz)
-   (defhost vampire vampire.dmz))
-  (t
+  ((unsafe colo)
    (defhost radius radius.unsafe)
-   (defhost vampire vampire.unsafe)))
+   (defhost vampire vampire.unsafe))
+  (t
+   (defhost radius radius.dmz)
+   (defhost vampire vampire.dmz)))
 
 ;;;----- That's all, folks --------------------------------------------------