From 04d651827f81da5e6ee2c7d8d2a47f1bc6644011 Mon Sep 17 00:00:00 2001 Message-Id: <04d651827f81da5e6ee2c7d8d2a47f1bc6644011.1715306069.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 11 Mar 2012 04:56:33 +0000 Subject: [PATCH] distorted.lisp: Fix which network ranges are announced. Organization: Straylight/Edgeware From: Mark Wooding 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. --- distorted.lisp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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) -- [mdw]