X-Git-Url: https://git.distorted.org.uk/~mdw/zone/blobdiff_plain/2d8313b9b91fd104faf9d102910c10d022b91926..HEAD:/frontend.lisp

diff --git a/frontend.lisp b/frontend.lisp
index 613fb21..1c1a442 100644
--- a/frontend.lisp
+++ b/frontend.lisp
@@ -22,7 +22,7 @@
 ;;; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 (defpackage #:zone.frontend
-  (:use #:common-lisp #:mdw.sys-base #:optparse #:net #:zone
+  (:use #:common-lisp #:mdw.base #:mdw.sys-base #:optparse #:net #:zone
 	#+(or cmu clisp) #:mop
 	#+sbcl #:sb-mop)
   (:export #:main))
@@ -60,7 +60,46 @@
       (if (and path
 	       (not (pathname-name path)))
 	  (setf var path)
-	  (option-parse-error "path `~A' doesn't name a directory." arg)))))
+	  (option-parse-error "path `~A' doesn't name a directory." arg))))
+  (let ((duration-units (make-hash-table :test #'equal)))
+    (dolist (item '((("Gs") #.(* 1000 1000 1000))
+		    (("Ms") #.(* 1000 1000))
+		    (("ks") 1000)
+		    (("hs") 100)
+		    (("das") 10)
+		    (("yr" "year" "years" "y") #.(* 365 24 60 60))
+		    (("wk" "week" "weeks" "w") #.(* 7 24 60 60))
+		    (("day" "days" "dy" "d") #.(* 24 60 60))
+		    (("hr" "hour" "hours" "h") #.(* 60 60))
+		    (("min" "minute" "minutes" "m") 60)
+		    (("s" "second" "seconds" "sec" "") 1)))
+      (dolist (name (car item))
+	(setf (gethash name duration-units) (cadr item))))
+    (defopthandler dur (var arg) ()
+      (let ((len (length arg)))
+	  (multiple-value-bind (n i) (parse-integer arg :junk-allowed t)
+	    (unless n
+	      (option-parse-error "invalid duration `~A': ~
+				   integer expected" arg))
+	    (loop (cond ((or (>= i len)
+			     (not (whitespace-char-p (char arg i))))
+			 (return))
+			(t
+			 (incf i))))
+	    (let ((u0 i))
+	      (loop (cond ((or (>= i len)
+			       (whitespace-char-p (char arg i)))
+			   (return))
+			  (t
+			   (incf i))))
+	      (let* ((u1 i)
+		     (unit (subseq arg u0 u1))
+		     (scale (gethash unit duration-units)))
+		(unless scale
+		  (option-parse-error "invalid duration `~A': ~
+				       unknown unit `~A'"
+				      arg unit))
+		(setf var (* n scale)))))))))
 
 (define-program
     :version "1.0.0" :usage "ZONEDEF..."
@@ -75,6 +114,22 @@
 			   "Designate NET as a preferred subnet.")
 		      (#\D "debug" (set opt-debug)
 			   "Produce stack backtrace on error.")
+		      "Timeout options"
+		      (#\E "expire" (:arg "DURATION")
+			   (dur *default-zone-expire*)
+			   "Set default zone expiry period.")
+		      (#\N "min-ttl" (:arg "DURATION")
+			   (dur *default-zone-min-ttl*)
+			   "Set default zone minimum/negative time-to-live.")
+		      (#\R "refresh" (:arg "DURATION")
+			   (dur *default-zone-refresh*)
+			   "Set default zone refresh period.")
+		      (#\T "ttl" (:arg "DURATION")
+			   (dur *default-zone-ttl*)
+			   "Set default zone time-to-live.")
+		      (#\Y "retry" (:arg "DURATION")
+			   (dur *default-zone-retry*)
+			   "Set default zone retry period.")
 		      "Output options"
 		      (#\d "directory" (:arg "DIRECTORY")
 			   (dir *zone-output-path*)
@@ -110,7 +165,8 @@
 		 (progv *zone-config* (mapcar #'symbol-value *zone-config*)
 		   (load f :verbose nil :print nil :if-does-not-exist :error)
 		   (delete-package *package*))))
-	     (zone-save opt-zones :format opt-format)))
+	     (zone-save opt-zones :format opt-format)
+	     t))
       (with-unix-error-reporting ()
 	(unless (option-parse-try
 		  (do-options ()
@@ -121,6 +177,7 @@
 	  (die-usage)))
       (if opt-debug
 	  (run)
-	  (with-unix-error-reporting () (run))))))
+	  (with-unix-error-reporting () (run)))
+      t)))
 
 ;;;----- That's all, folks --------------------------------------------------