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 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -80,7 +80,9 @@
        (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 @@
        (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)