X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/be5a78bf69376e5423909a568e805c18cbacb66e..HEAD:/hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index 66c3f46..b77cd67 100644
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -28,12 +28,17 @@ (defnet distorted.org.uk "172.29.198/23"
     (hippo "144/28")
     (upn "160/27"))
   (trusted "199.0/24"
-    (wired "0/25"
-      (unsafe "0/27")
-      (dhcp "32/27"))
+    (unsafe "0/25"
+      (unsafe-static00 "0/27")
+      (unsafe-dhcp01 "32/27")
+      (unsafe-dhcp1x "64/26"))
     (vpn "128/27")
     (its "160/30")
-    (safe "192/27")
+    (safe "192/27"
+      (safe-static00x "192/29")
+      (safe-static010 "200/30")
+      (safe-dhcp011 "204/30")
+      (safe-dhcp1xx "208/28"))
     (any "224/27")))
 
 ;; Externally routable DMZ from Andrews and Arnold.
@@ -42,19 +47,22 @@ (defnet dmz "81.187.238.128/28")
 (defnet dmz1 "217.169.12.64/28")
 (defnet distorted.org.uk-aaisp "2001:8b0:c92/48"
   (unsafe "1/64"
-    (dhcp "6468:6370/96"))
+    (unsafe-dhcp "6468:6370/96"))
   (any "0/64")
   (dmz "fff/64")
-  (safe "4001/64")
+  (safe "4001/64"
+    (safe-dhcp "6468:6370/96"))
   (vpn "6000/64")
   (untrusted "8001/64")
   (upn "a000/64"))
 
+(defnet jump-ipv6 "2001:ba8:1d9/48")
+
 ;;;--------------------------------------------------------------------------
 ;;; Host allocations
 
 ;; External addresses.
-(defhost guvnor.dmz ((:ipv4 gw 0) (:ipv6 dmz "::1:1")))
+(defhost guvnor.dmz (gw 0))
 (defhost radius.dmz (dmz 1))
 (defhost roadstar.dmz (dmz 2))
 (defhost jem.dmz (dmz 3))
@@ -75,6 +83,10 @@ (defhost marshall.dmz ((:ipv4 dmz1 11) (:ipv6 dmz "::2:1")))
 (defhost richmond.dmz ((:ipv4 dmz1 12) (:ipv6 dmz "::1:1")))
 (defhost blackhole.dmz ((:ipv4 dmz1 14) (:ipv6 dmz "::ffff")))
 
+;; Jump virtual hosts.
+(defhost eggle.jump ((:ipv4 "185.73.44.143")
+		     (:ipv6 jump-ipv6 "8002::1")))
+
 ;; Linode virtual hosts.
 (defhost national.linode ((:ipv4 "45.33.118.239")
 			  (:ipv6 "2600:3c00::f03c:91ff:fe3b:d7c1")))
@@ -100,9 +112,10 @@ (defhost crybaby.unsafe ((:ipv6 unsafe "216:eaff:fec2:4cb8")))
 (defhost lespaul.unsafe ((:ipv6 unsafe "a00:27ff:fef5:aaef")))
 (defhost haze.unsafe ((:ipv6 unsafe "5056:a8ff:fe01:5654")))
 (defhost gretsch.unsafe ((:ipv6 unsafe "3a2c:4aff:fe6d:e768")))
+(defhost spirit.unsafe ((:ipv6 unsafe "568d:5aff:fed9:18b8")))
 (defhost invader.safe ((:ipv6 safe "a00:27ff:fe94:a5d7")))
 (defhost marauder.safe ((:ipv6 safe "a00:27ff:fe6a:7846")))
-(defhost spirit.unsafe ((:ipv6 unsafe "568d:5aff:fed9:18b8")))
+(defhost unicorn.safe ((:ipv6 safe "20e:c6ff:fe90:a926")))
 
 ;; Safe network.
 (defhost radius.safe (safe 1))
@@ -114,6 +127,7 @@ (defhost tritan.safe (safe 6))
 (defhost kitkat.safe (safe 7))
 (defhost lunch.safe (safe 8))
 (defhost burntaxe.safe (safe 9))
+(defhost unicorn.safe ((:ipv4 safe 10)))
 
 ;; Wireless network.
 (defhost radius.untrusted (untrusted 1))
@@ -136,6 +150,7 @@ (defhost groove.vpn ((:ipv4 vpn 10) (:ipv6 vpn "::10:1")))
 ;; Untrusted private network.
 (defhost national.upn ((:ipv4 upn 1) (:ipv6 upn "::1:1")))
 (defhost mdwdev.upn ((:ipv4 upn 2) (:ipv6 upn "::2:1")))
+(defhost eggle.upn ((:ipv4 upn 3) (:ipv6 upn "::3:1")))
 
 ;; Iodine network.
 (defhost jazz.iodine (iodine 1))
@@ -169,16 +184,15 @@    (defhost vampire vampire.unsafe)
    (defhost precision precision.unsafe)
    (defhost telecaster telecaster.unsafe)
    (defhost stratocaster stratocaster.unsafe)
-   (defhost national national.upn))
+   (defhost national national.upn)
+   (defhost eggle eggle.upn))
   (t
    (defhost radius radius.dmz)
    (defhost vampire vampire.dmz)
    (defhost precision precision.dmz)
    (defhost telecaster telecaster.dmz)
    (defhost stratocaster stratocaster.dmz)
-   (defhost national national.linode)))
-
-(defhost marshall marshall.dmz)
-(defhost mdwdev mdwdev.upn)
+   (defhost national national.linode)
+   (defhost eggle eggle.jump)))
 
 ;;;----- That's all, folks --------------------------------------------------