From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 11 Mar 2012 04:56:33 +0000 (+0000)
Subject: distorted.lisp: Fix which network ranges are announced.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/commitdiff_plain/04d651827f81da5e6ee2c7d8d2a47f1bc6644011?ds=sidebyside

distorted.lisp: Fix which network ranges are announced.

The `wired' net doesn't really exist as a coherent entity any more; and
the `unsafe', `untrusted' and `safe' networks are fairly well-defined,
really, so announce them properly.
---

diff --git a/distorted.lisp b/distorted.lisp
index e9ac728..86c0e3a 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -80,7 +80,9 @@ (defzone distorted.org.uk
 	(jump :a jazz.jump))
 
   ;; Wired ethernet.
-  (wired :net wired)
+  (unsafe :net unsafe)
+  (safe :net safe)
+  (untrusted :net untrusted)
   (vampire (unsafe :a vampire.unsafe)
 	   (dmz :a vampire.dmz)
 	   (untrusted :a vampire.untrusted)
@@ -128,8 +130,8 @@ (defrevzone trusted
        (vampire.ns :ip vampire))
   :reverse trusted
   (dhcp :ns (radius.ns vampire.ns))
-  (@ :cidr-delegation
-     (dhcp (dhcp 199.29.172.dhcp.199.29.172.in-addr.arpa))))
+  :cidr-delegation
+  (trusted ((dhcp safe) 199.29.172.dhcp.199.29.172.in-addr.arpa)))
 
 (defrevzone dmz
   :ns ((radius.ns :ip radius)