From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Wed, 26 Dec 2018 01:42:57 +0000 (-0500)
Subject: domain: add node ipv6 address to nodeMap
X-Git-Tag: release_20181215~4
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/9508ffdf9ea4f8d347068cc6bb01755de7fe9b7d?ds=sidebyside

domain: add node ipv6 address to nodeMap
---

diff --git a/src/domain.sig b/src/domain.sig
index 1f37885..b55bc17 100644
--- a/src/domain.sig
+++ b/src/domain.sig
@@ -75,10 +75,12 @@ signature DOMAIN = sig
 
     val nodes : string list
     (* Names of all system nodes *)
-    val nodeMap : string Ast.StringMap.map
+    val nodeMap : (string * string) Ast.StringMap.map
     (* Map node names to IP addresses *)
     val nodeIp : string -> string
     (* Look up a node in nodeMap *)
+    val nodeIpv6 : string -> string
+    (* Look up a node in nodeMap *)
 
     val setUser : string -> unit
     val getUser : unit -> string
diff --git a/src/domain.sml b/src/domain.sml
index 90afaad..85781a8 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -30,9 +30,10 @@ fun set_context ctx = ssl_context := SOME ctx
 fun get_context () = valOf (!ssl_context)
 
 val nodes = map #1 Config.nodeIps
-val nodeMap = foldl (fn ((node, ip, ipv6), mp) => SM.insert (mp, node, ip))
+val nodeMap = foldl (fn ((node, ip, ipv6), mp) => SM.insert (mp, node, (ip, ipv6)))
 		    SM.empty Config.nodeIps
-fun nodeIp node = valOf (SM.find (nodeMap, node))
+fun nodeIp node = #1 (valOf (SM.find (nodeMap, node)))
+fun nodeIpv6 node = #2 (valOf (SM.find (nodeMap, node)))
 
 val usr = ref ""
 fun getUser () = !usr