distorted: Provide ITS with its own little network.

ITS doesn't understand point-to-point links (bless), so humour it and
give it a little four-host network.

Also make the source file prettier.

diff --git a/distorted.lisp b/distorted.lisp
index 980c96b7fba586a66aea3db4fa5b0a0cfbfa8ffc..253c560f5d59f8ae3058ad99e27cf0faee3272c8 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -2,8 +2,10 @@
 
 (load "hosts" :verbose nil)
 
 
 (load "hosts" :verbose nil)
 

-;; Network allocations
-;; (RFC1918 addresses are allocated from Cambridge G-RIN.)
+;;;--------------------------------------------------------------------------
+;;; Network allocations
+;;; (RFC1918 addresses are allocated from Cambridge G-RIN.)
+

 (defnet distorted.org.uk 172.29.198.0/23
   (untrusted 256
     (wireless 64))
 (defnet distorted.org.uk 172.29.198.0/23
   (untrusted 256
     (wireless 64))


@@ -12,23 +14,38 @@ (defnet distorted.org.uk 172.29.198.0/23
       (unsafe 32)
       (dhcp 32)
       (safe 32))
       (unsafe 32)
       (dhcp 32)
       (safe 32))

-    (virtual 32)))
+    (virtual 32)
+    (its 4)))
+
+;;;--------------------------------------------------------------------------
+;;; Host allocations

 
 

-;; Host allocations
+;; External addresses.

 (defhost guvnor.demon 80.177.3.76)
 
 (defhost guvnor.demon 80.177.3.76)
 

+;; Unsafe network.

 (defhost guvnor (unsafe 1))
 (defhost metalzone (unsafe 2))
 (defhost evolution (unsafe 3))
 (defhost vampire (unsafe 4))
 
 (defhost guvnor (unsafe 1))
 (defhost metalzone (unsafe 2))
 (defhost evolution (unsafe 3))
 (defhost vampire (unsafe 4))
 

+;; Safe network.

 (defhost tubescreamer (safe 1))
 (defhost obsidian (safe 2))
 
 (defhost tubescreamer (safe 1))
 (defhost obsidian (safe 2))
 

+;; Wireless network.

 (defhost evolution.wireless (wireless 1))
 
 (defhost evolution.wireless (wireless 1))
 

+;; Virtual private network.

 (defhost fuzzface (virtual 1))
 (defhost fuzzface (virtual 1))

-(defhost mz (virtual 2))
+
+;; Special network for ITS.
+;; It doesn't understand point-to-point links, so we need a little net.
+(defhost gw (its 1))
+(defhost mz (its 2))
+
+;;;--------------------------------------------------------------------------
+;;; Other definitions.

 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 


@@ -40,6 +57,9 @@    (defhost www-frontend metalzone))
    (setf *default-zone-source* 'guvnor.distorted.org.uk.)
    (defhost www-frontend guvnor.demon)))
 
    (setf *default-zone-source* 'guvnor.distorted.org.uk.)
    (defhost www-frontend guvnor.demon)))
 

+;;;--------------------------------------------------------------------------
+;;; Main zone definition.
+

 (defzone distorted.org.uk
   ;;
   ;; Nameservers
 (defzone distorted.org.uk
   ;;
   ;; Nameservers


@@ -65,6 +85,7 @@ (defzone distorted.org.uk
   (guvnor (inet :a guvnor.demon) (fretwank :a guvnor))
   ;;
   ;; Wireless gateway
   (guvnor (inet :a guvnor.demon) (fretwank :a guvnor))
   ;;
   ;; Wireless gateway

+  (wireless :net wireless)

   (evolution (fretwank :a evolution) (wireless :a evolution.wireless))
   ;;
   ;; Local services
   (evolution (fretwank :a evolution) (wireless :a evolution.wireless))
   ;;
   ;; Local services


@@ -82,20 +103,26 @@ (defzone distorted.org.uk
   ((www-cache wpad ntp1) (fretwank :svc vampire))
   ;;
   ;; Wired ethernet
   ((www-cache wpad ntp1) (fretwank :svc vampire))
   ;;
   ;; Wired ethernet

+  (fretwank :net fretwank)

   (metalzone (inet :a guvnor.demon) (fretwank :a metalzone))
   (vampire (fretwank :a vampire))
   (tubescreamer (fretwank :a tubescreamer))
   (obsidian (fretwank :a obsidian))
   (metalzone (inet :a guvnor.demon) (fretwank :a metalzone))
   (vampire (fretwank :a vampire))
   (tubescreamer (fretwank :a tubescreamer))
   (obsidian (fretwank :a obsidian))

+  ;;
+  ;; Virtual network
+  (virtual :net virtual)

   (fuzzface (virtual :a fuzzface))
   (fuzzface (virtual :a fuzzface))

-  (mz (virtual :a mz))

   ;;
   ;;

-  ;; Delegations
-  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns))
+  ;; ITS
+  (its :net its)
+  (gw (its :a gw))
+  (mz (its :a mz))

   ;;
   ;;

-  ;; Networks
-  (fretwank :net fretwank)
-  (wireless :net wireless)
-  (virtual :net virtual))
+  ;; Delegations
+  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns)))
+
+;;;--------------------------------------------------------------------------
+;;; Other subsidiary zones.

 
 (defrevzone trusted
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
 
 (defrevzone trusted
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))


@@ -123,3 +150,5 @@ (defzone dhcp.199.29.172.in-addr.arpa
 (defzone wireless.198.29.172.in-addr.arpa
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
   :reverse ((wireless :bytes 4)))
 (defzone wireless.198.29.172.in-addr.arpa
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
   :reverse ((wireless :bytes 4)))

+
+;;;----- That's all, folks --------------------------------------------------