domain: ipv6 support for nodes, new your_ipv6 type

[hcoop/domtool2.git] / src / domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 85781a8..a84a6d8 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -55,6 +55,9 @@ fun your_paths () = !your_pths
 val your_ipss = ref SS.empty
 fun your_ips () = !your_ipss
 
+val your_ipv6ss = ref SS.empty
+fun your_ipv6s () = !your_ipv6ss
+
 val world_readable = SS.addList (SS.empty, Config.worldReadable)
 val readable_pths = ref world_readable
 fun readable_paths () = !readable_pths
@@ -77,7 +80,9 @@ fun setUser user =
        your_pths := your_paths;
        readable_pths := SS.union (your_paths, world_readable);
        your_ipss := Acl.class {user = getUser (),
-                               class = "ip"}
+                               class = "ip"};
+       your_ipv6ss := Acl.class {user = getUser (),
+                               class = "ipv6"}
     end
 
 fun declareClient () = isClient := true
@@ -148,6 +153,7 @@ val yourPath = checkPath your_paths
 val readablePath = checkPath readable_paths
 
 fun yourIp s = !fakePrivs orelse SS.member (your_ips (), s)
+fun yourIpv6 s = !fakePrivs orelse SS.member (your_ipv6s (), s)
 
 fun yourDomainHost s =
     !fakePrivs
@@ -237,6 +243,10 @@ val _ = Env.type_one "your_ip"
        Env.string
        yourIp
 
+val _ = Env.type_one "your_ipv6"
+       Env.string
+       yourIpv6
+
 val _ = Env.type_one "node"
        Env.string
        validNode
@@ -249,6 +259,10 @@ val _ = Env.registerFunction ("your_ip_to_ip",
                              fn [e] => SOME e
                               | _ => NONE)
 
+val _ = Env.registerFunction ("your_ipv6_to_ipv6",
+                             fn [e] => SOME e
+                              | _ => NONE)
+
 val _ = Env.registerFunction ("dns_node_to_node",
                              fn [e] => SOME e
                               | _ => NONE)
@@ -326,6 +340,10 @@ val _ = Env.registerFunction ("ip_of_node",
                              fn [(EString node, _)] => SOME (EString (nodeIp node), dl)
                               | _ => NONE)
 
+val _ = Env.registerFunction ("ipv6_of_node",
+                             fn [(EString node, _)] => SOME (EString (nodeIpv6 node), dl)
+                              | _ => NONE)
+
 val master = fn (EApp ((EVar "externalMaster", _), e), _) => Option.map ExternalMaster (ip e)
              | (EApp ((EVar "internalMaster", _), e), _) => Option.map InternalMaster (Env.string e)
              | _ => NONE