zoneconf.in: More master-map hacking: !ADDR means ADDR!ADDR.

[zoneconf] / zoneconf.in

diff --git a/zoneconf.in b/zoneconf.in
index 21cff51963493f471889794089d3d662e71e1239..edf11841bcb4b0d9828e0ca1b950182409613b7b 100755 (executable)
--- a/zoneconf.in
+++ b/zoneconf.in
@@ -1000,7 +1000,7 @@ define-configuration-space zone ZONECFG {
           "-S" \
           "-K%h/key" \
           "-d%h/ds" \
-          "-s-3600" "-e+176400" \
+          "-s-3600" "-e+176400" "-i90000" \
           "-N%q" \
           "-o%z" \
           "-f%o" \
@@ -1022,6 +1022,12 @@ define-configuration-space zone ZONECFG {
   }
 
   define primary {map} {
+    ## There's a grim hack here: a primary-address entry may have the form
+    ## REAL!FAKE.  If the REAL address is not a local address then this
+    ## is used as the master address; otherwise the FAKE address is used.
+    ## This is useful for inter-view updates of dynamic zones on the same
+    ## host.  I suggest abusing 127.0.0.0/8 addresses for this kind of
+    ## chicanery.
     if {[llength $map] % 2} {
       error "master map must have an even number of items"
     }
@@ -1141,13 +1147,28 @@ proc compute-zone-properties {view config} {
   if {[info exists zone(mapped-view)]} {
     foreach {outview hosts} $zone(master-map) {
       if {[string match $outview $zone(mapped-view)]} {
-       set zone(masters) $hosts
+       set masters {}
        set zone(config-type) slave
        foreach host $hosts {
-         if {[local-address-p $host]} {
+         set bang [string first "!" $host]
+         if {$bang >= 0} {
+           set after [string range $host [expr {$bang + 1}] end]
+           if {$bang} {
+             set before [string range $host 0 [expr {$bang - 1}]]
+           } else {
+             set before $after
+           }
+           if {[local-address-p $before]} {
+             set host $after
+           } else {
+             set host $before
+           }
+         } elseif {[local-address-p $host]} {
            set zone(config-type) master
          }
+         lappend masters $host
        }
+       set zone(masters) $masters
        break
       }
     }