Add delegated reverse-zone for DHCP-allocated addresses.

diff --git a/Makefile.m4 b/Makefile.m4
index fa220a3675ca896ea924499c226caddc5f8824f1..9d64f8ac8c4a47759d776799b7476cebe17e3645 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -35,7 +35,9 @@ m4_divert(-1)
 ### Domains.
 
 DOMAIN([distorted], [inet, fretwank],
 ### Domains.
 
 DOMAIN([distorted], [inet, fretwank],

-       [distorted.org.uk, 198.29.172.in-addr.arpa, 199.29.172.in-addr.arpa])
+       [distorted.org.uk, dhcp.distorted.org.uk,
+        198.29.172.in-addr.arpa,
+        199.29.172.in-addr.arpa, dhcp.199.29.172.in-addr.arpa])

 DOMAIN([harlequin], [inet], [harlequin.org.uk])
 
 m4_divert(0)
 DOMAIN([harlequin], [inet], [harlequin.org.uk])
 
 m4_divert(0)

diff --git a/distorted.lisp b/distorted.lisp
index 6c0e490c1073598c0a0b9798d582c55a66163e57..55cf7839ade7be00ddd2f61f0c5eb14d5a49deff 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -81,15 +81,31 @@ (defzone distorted.org.uk
   (fuzzface (virtual :a fuzzface))
   (mz (virtual :a mz))
   ;;
   (fuzzface (virtual :a fuzzface))
   (mz (virtual :a mz))
   ;;

+  ;; Delegations
+  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns))
+  ;;

   ;; Networks
   (fretwank :net fretwank)
   ;; Networks
   (fretwank :net fretwank)

-  (dhcp :net dhcp)

   (wireless :net wireless)
   (virtual :net virtual))
 
 (defrevzone trusted
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
   (wireless :net wireless)
   (virtual :net virtual))
 
 (defrevzone trusted
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))

-  :reverse trusted)
+  :reverse trusted
+  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns))
+  #+subnet/fretwank (@ :cidr-delegation
+                      (dhcp
+                       (dhcp 199.29.172.dhcp.199.29.172.in-addr.arpa))))
+

 (defrevzone untrusted
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
   :reverse untrusted)
 (defrevzone untrusted
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
   :reverse untrusted)

+
+(defzone dhcp.distorted.org.uk
+  :ns (metalzone.ns.distorted.org.uk.
+       vampire.ns.distorted.org.uk.)
+  :net dhcp)
+
+(defzone dhcp.199.29.172.in-addr.arpa
+  :ns (metalzone.ns.199.29.172.in-addr.arpa.
+       vampire.ns.199.29.172.in-addr.arpa.))