X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zone/blobdiff_plain/b68068e3fc0ff8ac99977f783b64fc87953c0bde..88867b1a56e50b1a208b052dd75451143f92b7ae:/zone.lisp

diff --git a/zone.lisp b/zone.lisp
index 8124b28..d25986a 100644
--- a/zone.lisp
+++ b/zone.lisp
@@ -27,7 +27,8 @@
 (defpackage #:zone
   (:use #:common-lisp
 	#:mdw.base #:mdw.str #:collect #:safely
-	#:net #:services))
+	#:net #:services)
+  (:import-from #:net #:round-down #:round-up))
 
 (in-package #:zone)
 
@@ -63,7 +64,7 @@ (export 'timespec-seconds)
 (defun timespec-seconds (ts)
   "Convert a timespec TS to seconds.
 
-   A timespec may be a real count of seconds, or a list (COUNT UNIT): UNIT
+   A timespec may be a real count of seconds, or a list (COUNT UNIT).  UNIT
    may be any of a number of obvious time units."
   (cond ((null ts) 0)
 	((realp ts) (floor ts))
@@ -200,15 +201,21 @@ (defstruct (zone-record (:conc-name zr-))
 
 (export 'zone-subdomain)
 (defstruct (zone-subdomain (:conc-name zs-))
-  "A subdomain.  Slightly weird.  Used internally by zone-process-records
-   below, and shouldn't escape."
+  "A subdomain.
+
+   Slightly weird.  Used internally by `zone-process-records', and shouldn't
+   escape."
   name
   ttl
   records)
 
 (export '*zone-output-path*)
-(defvar *zone-output-path* *default-pathname-defaults*
-  "Pathname defaults to merge into output files.")
+(defvar *zone-output-path* nil
+  "Pathname defaults to merge into output files.
+
+   If this is nil then use the prevailing `*default-pathname-defaults*'.
+   This is not the same as capturing the `*default-pathname-defaults*' from
+   load time.")
 
 (export '*preferred-subnets*)
 (defvar *preferred-subnets* nil
@@ -221,7 +228,7 @@ (defun zone-file-name (zone type)
   "Choose a file name for a given ZONE and TYPE."
   (merge-pathnames (make-pathname :name (string-downcase zone)
 				  :type (string-downcase type))
-		   *zone-output-path*))
+		   (or *zone-output-path* *default-pathname-defaults*)))
 
 (export 'zone-preferred-subnet-p)
 (defun zone-preferred-subnet-p (name)
@@ -230,11 +237,12 @@ (defun zone-preferred-subnet-p (name)
 
 (export 'preferred-subnet-case)
 (defmacro preferred-subnet-case (&body clauses)
-  "CLAUSES have the form (SUBNETS . FORMS).
+  "Execute a form based on which networks are considered preferred.
 
-   Evaluate the first FORMS whose SUBNETS (a list or single symbol, not
-   evaluated) are considered preferred by zone-preferred-subnet-p.  If
-   SUBNETS is the symbol t then the clause always matches."
+   The CLAUSES have the form (SUBNETS . FORMS) -- evaluate the first FORMS
+   whose SUBNETS (a list or single symbol, not evaluated) are listed in
+   `*preferred-subnets*'.  If SUBNETS is the symbol `t' then the clause
+   always matches."
   `(cond
     ,@(mapcar (lambda (clause)
 		(let ((subnets (car clause)))
@@ -250,29 +258,111 @@ (defmacro preferred-subnet-case (&body clauses)
 			(cdr clause))))
 	      clauses)))
 
+(export 'zone-parse-host)
+(defun zone-parse-host (f zname)
+  "Parse a host name F.
+
+   If F ends in a dot then it's considered absolute; otherwise it's relative
+   to ZNAME."
+  (setf f (stringify f))
+  (cond ((string= f "@") (stringify zname))
+	((and (plusp (length f))
+	      (char= (char f (1- (length f))) #\.))
+	 (string-downcase (subseq f 0 (1- (length f)))))
+	(t (string-downcase (concatenate 'string f "."
+					 (stringify zname))))))
+
+(export 'zone-make-name)
+(defun zone-make-name (prefix zone-name)
+  "Compute a full domain name from a PREFIX and a ZONE-NAME.
+
+   If the PREFIX ends with `.' then it's absolute already; otherwise, append
+   the ZONE-NAME, separated with a `.'.  If PREFIX is nil, or `@', then
+   return the ZONE-NAME only."
+  (if (or (not prefix) (string= prefix "@"))
+      zone-name
+      (let ((len (length prefix)))
+	(if (or (zerop len) (char/= (char prefix (1- len)) #\.))
+	    (join-strings #\. (list prefix zone-name))
+	    prefix))))
+
+;;;--------------------------------------------------------------------------
+;;; Serial numbering.
+
+(export 'make-zone-serial)
+(defun make-zone-serial (name)
+  "Given a zone NAME, come up with a new serial number.
+
+   This will (very carefully) update a file ZONE.serial in the current
+   directory."
+  (let* ((file (zone-file-name name :serial))
+	 (last (with-open-file (in file
+				   :direction :input
+				   :if-does-not-exist nil)
+		 (if in (read in)
+		     (list 0 0 0 0))))
+	 (now (multiple-value-bind
+		  (sec min hr dy mon yr dow dstp tz)
+		  (get-decoded-time)
+		(declare (ignore sec min hr dow dstp tz))
+		(list dy mon yr)))
+	 (seq (cond ((not (equal now (cdr last))) 0)
+		    ((< (car last) 99) (1+ (car last)))
+		    (t (error "Run out of sequence numbers for ~A" name)))))
+    (safely-writing (out file)
+      (format out
+	      ";; Serial number file for zone ~A~%~
+	       ;;   (LAST-SEQ DAY MONTH YEAR)~%~
+	       ~S~%"
+	      name
+	      (cons seq now)))
+    (from-mixed-base '(100 100 100) (reverse (cons seq now)))))
+
+;;;--------------------------------------------------------------------------
+;;; Zone form parsing.
+
 (defun zone-process-records (rec ttl func)
   "Sort out the list of records in REC, calling FUNC for each one.
 
    TTL is the default time-to-live for records which don't specify one.
 
-   The syntax is a little fiddly to describe.  It operates relative to a
-   subzone name NAME.
+   REC is a list of records of the form
+
+	({ :ttl TTL | TYPE DATA | (LABEL . REC) }*)
+
+   The various kinds of entries have the following meanings.
+
+   :ttl TTL		Set the TTL for subsequent records (at this level of
+			  nesting only).
+
+   TYPE DATA		Define a record with a particular TYPE and DATA.
+			  Record types are defined using `defzoneparse' and
+			  the syntax of the data is idiosyncratic.
 
-   ZONE-RECORD: RR | TTL | SUBZONE
-	The body of a zone form is a sequence of these.
+   ((LABEL ...) . REC)	Define records for labels within the zone.  Any
+			  records defined within REC will have their domains
+			  prefixed by each of the LABELs.  A singleton list
+			  of labels may instead be written as a single
+			  label.  Note, therefore, that
 
-   TTL: :ttl INTEGER
-	Sets the TTL for subsequent RRs in this zone or subzone.
+				(host (sub :a \"169.254.1.1\"))
 
-   RR: SYMBOL DATA
-	Adds a record for the current NAME; the SYMBOL denotes the record
-	type, and the DATA depends on the type.
+			  defines a record for `host.sub' -- not `sub.host'.
+
+   If REC contains no top-level records, but it does define records for a
+   label listed in `*preferred-subnets*', then the records for the first such
+   label are also promoted to top-level.
+
+   The FUNC is called for each record encountered, represented as a
+   `zone-record' object.  Zone parsers are not called: you get the record
+   types and data from the input form; see `zone-parse-records' if you want
+   the raw output."
 
-   SUBZONE: (LABELS ZONE-RECORD*)
-	Defines a subzone.  The LABELS is either a list of labels, or a
-	singleton label.  For each LABEL, evaluate the ZONE-RECORDs relative
-	to LABEL.NAME.  The special LABEL `@' is a no-op."
   (labels ((sift (rec ttl)
+	     ;; Parse the record list REC into lists of `zone-record' and
+	     ;; `zone-subdomain' objects, sorting out TTLs and so on.
+	     ;; Returns them as two values.
+
 	     (collecting (top sub)
 	       (loop
 		 (unless rec
@@ -293,7 +383,13 @@ (defun zone-process-records (rec ttl func)
 				     sub)))
 			 (t
 			  (error "Unexpected record form ~A" (car r))))))))
+
 	   (process (rec dom ttl)
+	     ;; Recursirvely process the record list REC, with a list DOM of
+	     ;; prefix labels, and a default TTL.  Promote records for a
+	     ;; preferred subnet to toplevel if there are no toplevel records
+	     ;; already.
+
 	     (multiple-value-bind (top sub) (sift rec ttl)
 	       (if (and dom (null top) sub)
 		   (let ((preferred
@@ -316,119 +412,9 @@ (defun zone-process-records (rec ttl func)
 		 (process (zs-records s)
 			  (cons (zs-name s) dom)
 			  (zs-ttl s))))))
-    (process rec nil ttl)))
-
-(export 'zone-parse-host)
-(defun zone-parse-host (f zname)
-  "Parse a host name F: if F ends in a dot then it's considered absolute;
-   otherwise it's relative to ZNAME."
-  (setf f (stringify f))
-  (cond ((string= f "@") (stringify zname))
-	((and (plusp (length f))
-	      (char= (char f (1- (length f))) #\.))
-	 (string-downcase (subseq f 0 (1- (length f)))))
-	(t (string-downcase (concatenate 'string f "."
-					 (stringify zname))))))
-(defun default-rev-zone (base bytes)
-  "Return the default reverse-zone name for the given BASE address and number
-   of fixed leading BYTES."
-  (join-strings #\. (collecting ()
-		      (loop for i from (- 3 bytes) downto 0
-			    do (collect (ipaddr-byte base i)))
-		      (collect "in-addr.arpa"))))
-
-(defun zone-name-from-net (net &optional bytes)
-  "Given a NET, and maybe the BYTES to use, convert to the appropriate
-   subdomain of in-addr.arpa."
-  (let ((ipn (net-get-as-ipnet net)))
-    (with-ipnet (net mask) ipn
-      (unless bytes
-	(setf bytes (- 4 (ipnet-changeable-bytes mask))))
-      (join-strings #\.
-		    (append (loop
-			       for i from (- 4 bytes) below 4
-			       collect (logand #xff (ash net (* -8 i))))
-			    (list "in-addr.arpa"))))))
-
-(defun zone-net-from-name (name)
-  "Given a NAME in the in-addr.arpa space, convert it to an ipnet."
-  (let* ((name (string-downcase (stringify name)))
-	 (len (length name))
-	 (suffix ".in-addr.arpa")
-	 (sufflen (length suffix))
-	 (addr 0)
-	 (n 0)
-	 (end (- len sufflen)))
-    (unless (and (> len sufflen)
-		 (string= name suffix :start1 end))
-      (error "`~A' not in ~A." name suffix))
-    (loop
-       with start = 0
-       for dot = (position #\. name :start start :end end)
-       for byte = (parse-integer name
-				 :start start
-				 :end (or dot end))
-       do (setf addr (logior addr (ash byte (* 8 n))))
-	  (incf n)
-       when (>= n 4)
-       do (error "Can't deduce network from ~A." name)
-       while dot
-       do (setf start (1+ dot)))
-    (setf addr (ash addr (* 8 (- 4 n))))
-    (make-ipnet addr (* 8 n))))
-
-(defun zone-parse-net (net name)
-  "Given a NET, and the NAME of a domain to guess from if NET is null, return
-   the ipnet for the network."
-  (if net
-      (net-get-as-ipnet net)
-      (zone-net-from-name name)))
-
-(defun zone-cidr-delg-default-name (ipn bytes)
-  "Given a delegated net IPN and the parent's number of changing BYTES,
-   return the default deletate zone prefix."
-  (with-ipnet (net mask) ipn
-    (join-strings #\.
-		  (reverse
-		   (loop
-		      for i from (1- bytes) downto 0
-		      until (zerop (logand mask (ash #xff (* 8 i))))
-		      collect (logand #xff (ash net (* -8 i))))))))
-
-;;;--------------------------------------------------------------------------
-;;; Serial numbering.
-
-(export 'make-zone-serial)
-(defun make-zone-serial (name)
-  "Given a zone NAME, come up with a new serial number.
-
-   This will (very carefully) update a file ZONE.serial in the current
-   directory."
-  (let* ((file (zone-file-name name :serial))
-	 (last (with-open-file (in file
-				   :direction :input
-				   :if-does-not-exist nil)
-		 (if in (read in)
-		     (list 0 0 0 0))))
-	 (now (multiple-value-bind
-		  (sec min hr dy mon yr dow dstp tz)
-		  (get-decoded-time)
-		(declare (ignore sec min hr dow dstp tz))
-		(list dy mon yr)))
-	 (seq (cond ((not (equal now (cdr last))) 0)
-		    ((< (car last) 99) (1+ (car last)))
-		    (t (error "Run out of sequence numbers for ~A" name)))))
-    (safely-writing (out file)
-      (format out
-	      ";; Serial number file for zone ~A~%~
-	       ;;   (LAST-SEQ DAY MONTH YEAR)~%~
-	       ~S~%"
-	      name
-	      (cons seq now)))
-    (from-mixed-base '(100 100 100) (reverse (cons seq now)))))
 
-;;;--------------------------------------------------------------------------
-;;; Zone form parsing.
+    ;; Process the records we're given with no prefix.
+    (process rec nil ttl)))
 
 (defun zone-parse-head (head)
   "Parse the HEAD of a zone form.
@@ -463,15 +449,6 @@ (defun zone-parse-head (head)
 		      :min-ttl (timespec-seconds min-ttl)
 		      :serial serial))))
 
-(export 'zone-make-name)
-(defun zone-make-name (prefix zone-name)
-  (if (or (not prefix) (string= prefix "@"))
-      zone-name
-      (let ((len (length prefix)))
-	(if (or (zerop len) (char/= (char prefix (1- len)) #\.))
-	    (join-strings #\. (list prefix zone-name))
-	    prefix))))
-
 (export 'defzoneparse)
 (defmacro defzoneparse (types (name data list
 			       &key (prefix (gensym "PREFIX"))
@@ -480,7 +457,9 @@ (defmacro defzoneparse (types (name data list
 			&body body)
   "Define a new zone record type.
 
-   The TYPES may be a list of synonyms.  The other arguments are as follows:
+   The arguments are as follows:
+
+   TYPES	A singleton type symbol, or a list of aliases.
 
    NAME		The name of the record to be added.
 
@@ -530,35 +509,28 @@ 	   (defun ,func (,prefix ,zname ,data ,ttl ,col)
 						   :make-ptr-p ,tmakeptrp)
 				 ,col)))
 		 ,@body)))
-	  ',type)))))
-
-(defun zone-parse-records (zone records)
-  "Parse the body of a zone form.
-
-   ZONE is the zone object; RECORDS is the body of the form."
-  (let ((zname (zone-name zone)))
-    (with-collection (rec)
-	(flet ((parse-record (zr)
-		 (let ((func (or (get (zr-type zr) 'zone-parse)
-				 (error "No parser for record ~A."
-					(zr-type zr))))
-		       (name (and (zr-name zr) (stringify (zr-name zr)))))
-		   (funcall func
-			    name
-			    zname
-			    (zr-data zr)
-			    (zr-ttl zr)
-			    rec))))
-	  (zone-process-records records
-				(zone-default-ttl zone)
-				#'parse-record))
-      (setf (zone-records zone) (nconc (zone-records zone) rec)))))
+	   ',type)))))
+
+(export 'zone-parse-records)
+(defun zone-parse-records (zname ttl records)
+  "Parse a sequence of RECORDS and return a list of raw records.
+
+   The records are parsed relative to the zone name ZNAME, and using the
+   given default TTL."
+  (collecting (rec)
+    (flet ((parse-record (zr)
+	     (let ((func (or (get (zr-type zr) 'zone-parse)
+			     (error "No parser for record ~A."
+				    (zr-type zr))))
+		   (name (and (zr-name zr) (stringify (zr-name zr)))))
+	       (funcall func name zname (zr-data zr) (zr-ttl zr) rec))))
+      (zone-process-records records ttl #'parse-record))))
 
 (export 'zone-parse)
 (defun zone-parse (zf)
   "Parse a ZONE form.
 
-  The syntax of a zone form is as follows:
+   The syntax of a zone form is as follows:
 
    ZONE-FORM:
      ZONE-HEAD ZONE-RECORD*
@@ -567,12 +539,10 @@ (defun zone-parse (zf)
      ((NAME*) ZONE-RECORD*)
    | SYM ARGS"
   (multiple-value-bind (zname ttl soa) (zone-parse-head (car zf))
-    (let ((zone (make-zone :name zname
-			   :default-ttl ttl
-			   :soa soa
-			   :records nil)))
-      (zone-parse-records zone (cdr zf))
-      zone)))
+    (make-zone :name zname
+	       :default-ttl ttl
+	       :soa soa
+	       :records (zone-parse-records zname ttl (cdr zf)))))
 
 (export 'zone-create)
 (defun zone-create (zf)
@@ -584,31 +554,72 @@ (defun zone-create (zf)
     name))
 
 (export 'defzone)
-(defmacro defzone (soa &rest zf)
+(defmacro defzone (soa &body zf)
   "Zone definition macro."
   `(zone-create '(,soa ,@zf)))
 
+(export '*address-family*)
+(defvar *address-family* t
+  "The default address family.  This is bound by `defrevzone'.")
+
 (export 'defrevzone)
-(defmacro defrevzone (head &rest zf)
+(defmacro defrevzone (head &body zf)
   "Define a reverse zone, with the correct name."
-  (destructuring-bind
-      (net &rest soa-args)
+  (destructuring-bind (nets &rest args
+			    &key &allow-other-keys
+				 (family '*address-family*)
+				 prefix-bits)
       (listify head)
-    (let ((bytes nil))
-      (when (and soa-args (integerp (car soa-args)))
-	(setf bytes (pop soa-args)))
-      `(zone-create '((,(zone-name-from-net net bytes) ,@soa-args) ,@zf)))))
+    (with-gensyms (ipn)
+      `(dolist (,ipn (net-parse-to-ipnets ',nets ,family))
+	 (let ((*address-family* (ipnet-family ,ipn)))
+	   (zone-create `((,(reverse-domain ,ipn ,prefix-bits)
+			    ,@',(loop for (k v) on args by #'cddr
+				      unless (member k
+						     '(:family :prefix-bits))
+				      nconc (list k v)))
+			  ,@',zf)))))))
+
+(defun map-host-addresses (func addr &key (family *address-family*))
+  "Call FUNC for each address denoted by ADDR (a `host-parse' address)."
+
+  (dolist (a (host-addrs (host-parse addr family)))
+    (funcall func a)))
+
+(defmacro do-host ((addr spec &key (family *address-family*)) &body body)
+  "Evaluate BODY, binding ADDR to each address denoted by SPEC."
+  `(dolist (,addr (host-addrs (host-parse ,spec ,family)))
+     ,@body))
+
+(export 'zone-set-address)
+(defun zone-set-address (rec addrspec &rest args
+			 &key (family *address-family*) name ttl make-ptr-p)
+  "Write records (using REC) defining addresses for ADDRSPEC."
+  (declare (ignore name ttl make-ptr-p))
+  (let ((key-args (loop for (k v) on args by #'cddr
+			unless (eq k :family)
+			nconc (list k v))))
+    (do-host (addr addrspec :family family)
+      (apply rec :type (ipaddr-rrtype addr) :data addr key-args))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Zone record parsers.
 
 (defzoneparse :a (name data rec)
   ":a IPADDR"
-  (rec :data (parse-ipaddr data) :make-ptr-p t))
+  (zone-set-address #'rec data :make-ptr-p t :family :ipv4))
+
+(defzoneparse :aaaa (name data rec)
+  ":aaaa IPADDR"
+  (zone-set-address #'rec data :make-ptr-p t :family :ipv6))
+
+(defzoneparse :addr (name data rec)
+  ":addr IPADDR"
+  (zone-set-address #'rec data :make-ptr-p t))
 
 (defzoneparse :svc (name data rec)
   ":svc IPADDR"
-  (rec :type :a :data (parse-ipaddr data)))
+  (zone-set-address #'rec data))
 
 (defzoneparse :ptr (name data rec :zname zname)
   ":ptr HOST"
@@ -622,6 +633,98 @@ (defzoneparse :txt (name data rec)
   ":txt TEXT"
   (rec :data data))
 
+(export '*dkim-pathname-defaults*)
+(defvar *dkim-pathname-defaults*
+  (make-pathname :directory '(:relative "keys")
+		 :type "dkim"))
+
+(defzoneparse :dkim (name data rec)
+  ":dkim (KEYFILE {:TAG VALUE}*)"
+  (destructuring-bind (file &rest plist) (listify data)
+    (let ((things nil) (out nil))
+      (labels ((flush ()
+		 (when out
+		   (push (get-output-stream-string out) things)
+		   (setf out nil)))
+	       (emit (text)
+		 (let ((len (length text)))
+		   (when (and out (> (+ (file-position out)
+					(length text))
+				     64))
+		     (flush))
+		   (when (plusp len)
+		     (cond ((< len 64)
+			    (unless out (setf out (make-string-output-stream)))
+			    (write-string text out))
+			   (t
+			    (do ((i 0 j)
+				 (j 64 (+ j 64)))
+				((>= i len))
+			      (push (subseq text i (min j len)) things))))))))
+	(do ((p plist (cddr p)))
+	    ((endp p))
+	  (emit (format nil "~(~A~)=~A;" (car p) (cadr p))))
+	(emit (with-output-to-string (out)
+		(write-string "p=" out)
+		(when file
+		  (with-open-file
+		      (in (merge-pathnames file *dkim-pathname-defaults*))
+		    (loop
+		      (when (string= (read-line in)
+				     "-----BEGIN PUBLIC KEY-----")
+			(return)))
+		    (loop
+		      (let ((line (read-line in)))
+			(if (string= line "-----END PUBLIC KEY-----")
+			    (return)
+			    (write-string line out)))))))))
+      (rec :type :txt
+	   :data (nreverse things)))))
+
+(eval-when (:load-toplevel :execute)
+  (dolist (item '((sshfp-algorithm rsa 1)
+		  (sshfp-algorithm dsa 2)
+		  (sshfp-algorithm ecdsa 3)
+		  (sshfp-type sha-1 1)
+		  (sshfp-type sha-256 2)))
+    (destructuring-bind (prop sym val) item
+      (setf (get sym prop) val)
+      (export sym))))
+
+(export '*sshfp-pathname-defaults*)
+(defvar *sshfp-pathname-defaults*
+  (make-pathname :directory '(:relative "keys")
+		 :type "sshfp"))
+
+(defzoneparse :sshfp (name data rec)
+  ":sshfp { FILENAME | ((FPR :alg ALG :type HASH)*) }"
+  (if (stringp data)
+      (with-open-file (in (merge-pathnames data *sshfp-pathname-defaults*))
+	(loop (let ((line (read-line in nil)))
+		(unless line (return))
+		(let ((words (str-split-words line)))
+		  (pop words)
+		  (when (string= (car words) "IN") (pop words))
+		  (unless (and (string= (car words) "SSHFP")
+			       (= (length words) 4))
+		    (error "Invalid SSHFP record."))
+		  (pop words)
+		  (destructuring-bind (alg type fpr) words
+		    (rec :data (list (parse-integer alg)
+				     (parse-integer type)
+				     fpr)))))))
+      (flet ((lookup (what prop)
+	       (etypecase what
+		 (fixnum what)
+		 (symbol (or (get what prop)
+			     (error "~S is not a known ~A" what prop))))))
+	(dolist (item (listify data))
+	  (destructuring-bind (fpr &key (alg 'rsa) (type 'sha-1))
+	      (listify item)
+	    (rec :data (list (lookup alg 'sshfp-algorithm)
+			     (lookup type 'sshfp-type)
+			     fpr)))))))
+
 (defzoneparse :mx (name data rec :zname zname)
   ":mx ((HOST :prio INT :ip IPADDR)*)"
   (dolist (mx (listify data))
@@ -629,7 +732,7 @@ (defzoneparse :mx (name data rec :zname zname)
 	(mxname &key (prio *default-mx-priority*) ip)
 	(listify mx)
       (let ((host (zone-parse-host mxname zname)))
-	(when ip (rec :name host :type :a :data (parse-ipaddr ip)))
+	(when ip (zone-set-address #'rec ip :name host))
 	(rec :data (cons host prio))))))
 
 (defzoneparse :ns (name data rec :zname zname)
@@ -639,7 +742,7 @@ (defzoneparse :ns (name data rec :zname zname)
 	(nsname &key ip)
 	(listify ns)
       (let ((host (zone-parse-host nsname zname)))
-	(when ip (rec :name host :type :a :data (parse-ipaddr ip)))
+	(when ip (zone-set-address #'rec ip :name host))
 	(rec :data host)))))
 
 (defzoneparse :alias (name data rec :zname zname)
@@ -670,107 +773,112 @@ (defzoneparse :srv (name data rec :zname zname)
 		 ip)
 		(listify prov)
 	      (let ((host (zone-parse-host srvname zname)))
-		(when ip (rec :name host :type :a :data (parse-ipaddr ip)))
+		(when ip (zone-set-address #'rec ip :name host))
 		(rec :name rname
 		     :data (list prio weight port host))))))))))
 
 (defzoneparse :net (name data rec)
   ":net (NETWORK*)"
   (dolist (net (listify data))
-    (let ((n (net-get-as-ipnet net)))
-      (rec :name (zone-parse-host "net" name)
-	   :type :a
-	   :data (ipnet-net n))
-      (rec :name (zone-parse-host "mask" name)
-	   :type :a
-	   :data (ipnet-mask n))
-      (rec :name (zone-parse-host "bcast" name)
-	   :type :a
-	   :data (ipnet-broadcast n)))))
+    (dolist (ipn (net-ipnets (net-must-find net)))
+      (let* ((base (ipnet-net ipn))
+	     (rrtype (ipaddr-rrtype base)))
+	(flet ((frob (kind addr)
+		 (when addr
+		   (rec :name (zone-parse-host kind name)
+			:type rrtype
+			:data addr))))
+	  (frob "net" base)
+	  (frob "mask" (ipaddr (ipnet-mask ipn) (ipnet-family ipn)))
+	  (frob "bcast" (ipnet-broadcast ipn)))))))
 
 (defzoneparse (:rev :reverse) (name data rec)
-  ":reverse ((NET :bytes BYTES) ZONE*)
+  ":reverse ((NET &key :prefix-bits :family) ZONE*)
 
    Add a reverse record each host in the ZONEs (or all zones) that lies
-   within NET.  The BYTES give the number of prefix labels generated; this
-   defaults to the smallest number of bytes needed to enumerate the net."
+   within NET."
   (setf data (listify data))
-  (destructuring-bind (net &key bytes) (listify (car data))
-    (setf net (zone-parse-net net name))
-    (unless bytes
-      (setf bytes (ipnet-changeable-bytes (ipnet-mask net))))
-    (let ((seen (make-hash-table :test #'equal)))
-      (dolist (z (or (cdr data)
-		     (hash-table-keys *zones*)))
-	(dolist (zr (zone-records (zone-find z)))
-	  (when (and (eq (zr-type zr) :a)
-		     (zr-make-ptr-p zr)
-		     (ipaddr-networkp (zr-data zr) net))
-	    (let ((name (string-downcase
-			 (join-strings
-			  #\.
-			  (collecting ()
-			    (dotimes (i bytes)
-			      (collect (logand #xff (ash (zr-data zr)
-							 (* -8 i)))))
-			    (collect name))))))
-	      (unless (gethash name seen)
-		(rec :name name :type :ptr
-		     :ttl (zr-ttl zr) :data (zr-name zr))
-		(setf (gethash name seen) t)))))))))
-
-(defzoneparse (:cidr-delegation :cidr) (name data rec :zname zname)
-  ":cidr-delegation ((NET :bytes BYTES) ((TARGET-NET*) [TARGET-ZONE])*)
-
-   Insert CNAME records for delegating a portion of the reverse-lookup
-   namespace which doesn't align with an octet boundary.
-
-   The NET specifies the origin network, in which the reverse records
-   naturally lie.  The BYTES are the number of labels to supply for each
-   address; the default is the smallest number which suffices to enumerate
-   the entire NET.  The TARGET-NETs are subnets of NET which are to be
-   delegated.  The TARGET-ZONEs are the zones to which we are delegating
-   authority for the reverse records: the default is to append labels for those
-   octets of the subnet base address which are not the same in all address in
-   the subnet."
-  (setf data (listify data))
-  (destructuring-bind (net &key bytes) (listify (car data))
-    (setf net (zone-parse-net net name))
-    (unless bytes
-      (setf bytes (ipnet-changeable-bytes (ipnet-mask net))))
-    (dolist (map (or (cdr data) (list (list net))))
-      (destructuring-bind (tnets &optional tdom) (listify map)
-	(dolist (tnet (listify tnets))
-	  (setf tnet (zone-parse-net tnet name))
-	  (unless (ipnet-subnetp net tnet)
-	    (error "~A is not a subnet of ~A."
-		   (ipnet-pretty tnet)
-		   (ipnet-pretty net)))
-	  (unless tdom
-	    (with-ipnet (net mask) tnet
-	      (setf tdom
-		    (join-strings
-		     #\.
-		     (append (reverse (loop
-				       for i from (1- bytes) downto 0
-				       until (zerop (logand mask
-							    (ash #xff
-								 (* 8 i))))
-				       collect (ldb (byte 8 (* i 8)) net)))
-			     (list name))))))
-	  (setf tdom (string-downcase (stringify tdom)))
-	  (dotimes (i (ipnet-hosts tnet))
-	    (unless (zerop i)
-	      (let* ((addr (ipnet-host tnet i))
-		     (tail (join-strings #\.
-					 (loop
-					  for i from 0 below bytes
-					  collect
-					  (logand #xff
-						  (ash addr (* 8 i)))))))
-		(rec :name (format nil "~A.~A" tail name)
-		     :type :cname
-		     :data (format nil "~A.~A" tail tdom))))))))))
+  (destructuring-bind (net &key prefix-bits (family *address-family*))
+      (listify (car data))
+
+    (dolist (ipn (net-parse-to-ipnets net family))
+      (let* ((seen (make-hash-table :test #'equal))
+	     (width (ipnet-width ipn))
+	     (frag-len (if prefix-bits (- width prefix-bits)
+			   (ipnet-changeable-bits width (ipnet-mask ipn)))))
+	(dolist (z (or (cdr data) (hash-table-keys *zones*)))
+	  (dolist (zr (zone-records (zone-find z)))
+	    (when (and (eq (zr-type zr) (ipaddr-rrtype (ipnet-net ipn)))
+		       (zr-make-ptr-p zr)
+		       (ipaddr-networkp (ipaddr-addr (zr-data zr)) ipn))
+	      (let* ((frag (reverse-domain-fragment (zr-data zr)
+						    0 frag-len))
+		     (name (concatenate 'string frag "." name)))
+		(unless (gethash name seen)
+		  (rec :name name :type :ptr
+		       :ttl (zr-ttl zr) :data (zr-name zr))
+		  (setf (gethash name seen) t))))))))))
+
+(defzoneparse (:multi) (name data rec :zname zname :ttl ttl)
+  ":multi (((NET*) &key :start :end :family :suffix) . REC)
+
+   Output multiple records covering a portion of the reverse-resolution
+   namespace corresponding to the particular NETs.  The START and END bounds
+   default to the most significant variable component of the
+   reverse-resolution domain.
+
+   The REC tail is a sequence of record forms (as handled by
+   `zone-process-records') to be emitted for each covered address.  Within
+   the bodies of these forms, the symbol `*' will be replaced by the
+   domain-name fragment corresponding to the current host, optionally
+   followed by the SUFFIX.
+
+   Examples:
+
+	(:multi ((delegated-subnet :start 8)
+		 :ns (some.ns.delegated.example :ip \"169.254.5.2\")))
+
+	(:multi ((tiny-subnet :suffix \"128.10.254.169.in-addr.arpa\")
+		 :cname *))
+
+   Obviously, nested `:multi' records won't work well."
+
+  (destructuring-bind (nets &key start end (family *address-family*) suffix)
+      (listify (car data))
+    (dolist (net (listify nets))
+      (dolist (ipn (net-parse-to-ipnets net family))
+	(let* ((addr (ipnet-net ipn))
+	       (width (ipaddr-width addr))
+	       (comp-width (reverse-domain-component-width addr))
+	       (end (round-up (or end
+				  (ipnet-changeable-bits width
+							 (ipnet-mask ipn)))
+			      comp-width))
+	       (start (round-down (or start (- end comp-width))
+				  comp-width))
+	       (map (ipnet-host-map ipn)))
+	  (multiple-value-bind (host-step host-limit)
+	      (ipnet-index-bounds map start end)
+	    (do ((index 0 (+ index host-step)))
+		((> index host-limit))
+	      (let* ((addr (ipnet-index-host map index))
+		     (frag (reverse-domain-fragment addr start end))
+		     (target (concatenate 'string
+					  (zone-make-name
+					   (if (not suffix) frag
+					       (concatenate 'string
+							    frag "." suffix))
+					   zname)
+					  ".")))
+		(dolist (zr (zone-parse-records (zone-make-name frag zname)
+						ttl
+						(subst target '*
+						       (cdr data))))
+		  (rec :name (zr-name zr)
+		       :type (zr-type zr)
+		       :data (zr-data zr)
+		       :ttl (zr-ttl zr)
+		       :make-ptr-p (zr-make-ptr-p zr)))))))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Zone file output.
@@ -824,6 +932,9 @@ (defun bind-hostname (hostname)
 	       (subseq h 0 (- hl rl 1)))
 	      (t (concatenate 'string h "."))))))
 
+(export 'bind-record)
+(defgeneric bind-record (type zr))
+
 (defmethod zone-write ((format (eql :bind)) zone stream)
   (format stream "~
 ;;; Zone file `~(~A~)'
@@ -859,9 +970,6 @@ (defmethod zone-write ((format (eql :bind)) zone stream)
   (dolist (zr (zone-records zone))
     (bind-record (zr-type zr) zr)))
 
-(export 'bind-record)
-(defgeneric bind-record (type zr))
-
 (export 'bind-format-record)
 (defun bind-format-record (name ttl type format args)
   (format *zone-output-stream*
@@ -872,14 +980,6 @@ (defun bind-format-record (name ttl type format args)
 	  (string-upcase (symbol-name type))
 	  format args))
 
-(defmethod bind-record (type zr)
-  (destructuring-bind (format &rest args)
-      (bind-record-format-args type (zr-data zr))
-    (bind-format-record (zr-name zr)
-			(zr-ttl zr)
-			(bind-record-type type)
-			format args)))
-
 (export 'bind-record-type)
 (defgeneric bind-record-type (type)
   (:method (type) type))
@@ -887,6 +987,7 @@ (defgeneric bind-record-type (type)
 (export 'bind-record-format-args)
 (defgeneric bind-record-format-args (type data)
   (:method ((type (eql :a)) data) (list "~A" (ipaddr-string data)))
+  (:method ((type (eql :aaaa)) data) (list "~A" (ipaddr-string data)))
   (:method ((type (eql :ptr)) data) (list "~A" (bind-hostname data)))
   (:method ((type (eql :cname)) data) (list "~A" (bind-hostname data)))
   (:method ((type (eql :ns)) data) (list "~A" (bind-hostname data)))
@@ -895,6 +996,18 @@ (defgeneric bind-record-format-args (type data)
   (:method ((type (eql :srv)) data)
     (destructuring-bind (prio weight port host) data
       (list "~2D ~5D ~5D ~A" prio weight port (bind-hostname host))))
-  (:method ((type (eql :txt)) data) (list "~S" (stringify data))))
+  (:method ((type (eql :sshfp)) data)
+    (cons "~2D ~2D ~A" data))
+  (:method ((type (eql :txt)) data)
+    (cons "~#[\"\"~;~S~:;(~@{~%~8T~S~} )~]"
+	  (mapcar #'stringify (listify data)))))
+
+(defmethod bind-record (type zr)
+  (destructuring-bind (format &rest args)
+      (bind-record-format-args type (zr-data zr))
+    (bind-format-record (zr-name zr)
+			(zr-ttl zr)
+			(bind-record-type type)
+			format args)))
 
 ;;;----- That's all, folks --------------------------------------------------