Fix dumb message name; allow numbers and underscores in database names

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

diff --git a/src/msg.sml b/src/msg.sml
index 1d168af..61fa4bc 100644 (file)
--- a/src/msg.sml
+++ b/src/msg.sml
@@ -88,6 +88,49 @@ fun recvBool bio =
       | SOME 1 => SOME true
       | _ => NONE
 
+fun sendSockPerm (bio, p) =
+    case p of
+       Any => OpenSSL.writeInt (bio, 0)
+      | Client => OpenSSL.writeInt (bio, 1)
+      | Server => OpenSSL.writeInt (bio, 2)
+      | Nada => OpenSSL.writeInt (bio, 3)
+
+fun recvSockPerm bio =
+    case OpenSSL.readInt bio of
+       SOME 0 => SOME Any
+      | SOME 1 => SOME Client
+      | SOME 2 => SOME Server
+      | SOME 3 => SOME Nada
+      | _ => NONE
+
+fun sendQuery (bio, q) =
+    case q of
+       QApt s => (OpenSSL.writeInt (bio, 0);
+                  OpenSSL.writeString (bio, s))
+      | QCron s => (OpenSSL.writeInt (bio, 1);
+                   OpenSSL.writeString (bio, s))
+      | QFtp s => (OpenSSL.writeInt (bio, 2);
+                  OpenSSL.writeString (bio, s))
+      | QTrustedPath s => (OpenSSL.writeInt (bio, 3);
+                          OpenSSL.writeString (bio, s))
+      | QSocket s => (OpenSSL.writeInt (bio, 4);
+                     OpenSSL.writeString (bio, s))
+      | QFirewall s => (OpenSSL.writeInt (bio, 5);
+                       OpenSSL.writeString (bio, s))
+
+fun recvQuery bio =
+    case OpenSSL.readInt bio of
+       SOME n =>
+       (case n of
+            0 => Option.map QApt (OpenSSL.readString bio)
+          | 1 => Option.map QCron (OpenSSL.readString bio)
+          | 2 => Option.map QFtp (OpenSSL.readString bio)
+          | 3 => Option.map QTrustedPath (OpenSSL.readString bio)
+          | 4 => Option.map QSocket (OpenSSL.readString bio)
+          | 5 => Option.map QFirewall (OpenSSL.readString bio)
+          | _ => NONE)
+      | NONE => NONE
+
 fun send (bio, m) =
     case m of
        MsgOk => OpenSSL.writeInt (bio, 1)
@@ -128,9 +171,9 @@ fun send (bio, m) =
       | MsgCreateDbUser {dbtype, passwd} => (OpenSSL.writeInt (bio, 16);
                                             OpenSSL.writeString (bio, dbtype);
                                             sendOption OpenSSL.writeString (bio, passwd))
-      | MsgCreateDbTable {dbtype, dbname} => (OpenSSL.writeInt (bio, 17);
-                                             OpenSSL.writeString (bio, dbtype);
-                                             OpenSSL.writeString (bio, dbname))
+      | MsgCreateDb {dbtype, dbname} => (OpenSSL.writeInt (bio, 17);
+                                        OpenSSL.writeString (bio, dbtype);
+                                        OpenSSL.writeString (bio, dbname))
       | MsgNewMailbox {domain, user, passwd, mailbox} =>
        (OpenSSL.writeInt (bio, 18);
         OpenSSL.writeString (bio, domain);
@@ -162,6 +205,30 @@ fun send (bio, m) =
       | MsgSaSet (addr, b) => (OpenSSL.writeInt (bio, 25);
                               OpenSSL.writeString (bio, addr);
                               sendBool (bio, b))
+      | MsgSmtpLogReq domain => (OpenSSL.writeInt (bio, 26);
+                                OpenSSL.writeString (bio, domain))
+      | MsgSmtpLogRes domain => (OpenSSL.writeInt (bio, 27);
+                                OpenSSL.writeString (bio, domain))
+      | MsgDbPasswd {dbtype, passwd} => (OpenSSL.writeInt (bio, 28);
+                                        OpenSSL.writeString (bio, dbtype);
+                                        OpenSSL.writeString (bio, passwd))
+      | MsgShutdown => OpenSSL.writeInt (bio, 29)
+      | MsgYes => OpenSSL.writeInt (bio, 30)
+      | MsgNo => OpenSSL.writeInt (bio, 31)
+      | MsgQuery q => (OpenSSL.writeInt (bio, 32);
+                      sendQuery (bio, q))
+      | MsgSocket p => (OpenSSL.writeInt (bio, 33);
+                       sendSockPerm (bio, p))
+      | MsgFirewall ls => (OpenSSL.writeInt (bio, 34);
+                          sendList OpenSSL.writeString (bio, ls))
+      | MsgRegenerateTc => OpenSSL.writeInt (bio, 35)
+      | MsgDropDb {dbtype, dbname} => (OpenSSL.writeInt (bio, 36);
+                                      OpenSSL.writeString (bio, dbtype);
+                                      OpenSSL.writeString (bio, dbname))
+      | MsgGrantDb {dbtype, dbname} => (OpenSSL.writeInt (bio, 37);
+                                       OpenSSL.writeString (bio, dbtype);
+                                       OpenSSL.writeString (bio, dbname))
+      | MsqMysqlFixperms => OpenSSL.writeInt (bio, 38)
 
 fun checkIt v =
     case v of
@@ -218,7 +285,7 @@ fun recv bio =
                              | _ => NONE)
                   | 17 => (case (OpenSSL.readString bio, OpenSSL.readString bio) of
                                (SOME dbtype, SOME dbname) =>
-                               SOME (MsgCreateDbTable {dbtype = dbtype, dbname = dbname})
+                               SOME (MsgCreateDb {dbtype = dbtype, dbname = dbname})
                              | _ => NONE)
                   | 18 => (case (OpenSSL.readString bio, OpenSSL.readString bio,
                                  OpenSSL.readString bio, OpenSSL.readString bio) of
@@ -250,6 +317,28 @@ fun recv bio =
                   | 25 => (case (OpenSSL.readString bio, recvBool bio) of
                                (SOME user, SOME b) => SOME (MsgSaSet (user, b))
                              | _ => NONE)
+                  | 26 => Option.map MsgSmtpLogReq (OpenSSL.readString bio)
+                  | 27 => Option.map MsgSmtpLogRes (OpenSSL.readString bio)
+                  | 28 => (case (OpenSSL.readString bio, OpenSSL.readString bio) of
+                               (SOME dbtype, SOME passwd) =>
+                               SOME (MsgDbPasswd {dbtype = dbtype, passwd = passwd})
+                             | _ => NONE)
+                  | 29 => SOME MsgShutdown
+                  | 30 => SOME MsgYes
+                  | 31 => SOME MsgNo
+                  | 32 => Option.map MsgQuery (recvQuery bio)
+                  | 33 => Option.map MsgSocket (recvSockPerm bio)
+                  | 34 => Option.map MsgFirewall (recvList OpenSSL.readString bio)
+                  | 35 => SOME MsgRegenerateTc
+                  | 36 => (case (OpenSSL.readString bio, OpenSSL.readString bio) of
+                               (SOME dbtype, SOME dbname) =>
+                               SOME (MsgDropDb {dbtype = dbtype, dbname = dbname})
+                             | _ => NONE)
+                  | 37 => (case (OpenSSL.readString bio, OpenSSL.readString bio) of
+                               (SOME dbtype, SOME dbname) =>
+                               SOME (MsgGrantDb {dbtype = dbtype, dbname = dbname})
+                             | _ => NONE)
+                  | 38 => SOME MsgMysqlFixperms
                   | _ => NONE)
         
 end