X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/737c68d4f3a11a344c7469085615e7a335c9a1b3..563e77927eb5faaae4571bd2b0811de590368581:/src/msg.sml

diff --git a/src/msg.sml b/src/msg.sml
index 3c795b2..3e028c1 100644
--- a/src/msg.sml
+++ b/src/msg.sml
@@ -23,12 +23,14 @@ structure Msg :> MSG = struct
 open OpenSSL MsgTypes Slave
 
 val a2i = fn Add => 0
-	   | Delete => 1
+	   | Delete true => 1
 	   | Modify => 2
+	   | Delete false => 3
 
 val i2a = fn 0 => Add
-	   | 1 => Delete
+	   | 1 => Delete true
 	   | 2 => Modify
+	   | 3 => Delete false
 	   | _ => raise OpenSSL.OpenSSL "Bad action number to deserialize"
 
 fun sendAcl (bio, {user, class, value}) =
@@ -115,6 +117,8 @@ fun sendQuery (bio, q) =
 			   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
@@ -125,6 +129,7 @@ fun recvQuery 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
 
@@ -168,9 +173,10 @@ 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, encoding} => (OpenSSL.writeInt (bio, 17);
+						   OpenSSL.writeString (bio, dbtype);
+						   OpenSSL.writeString (bio, dbname);
+						   sendOption OpenSSL.writeString (bio, encoding))
       | MsgNewMailbox {domain, user, passwd, mailbox} =>
 	(OpenSSL.writeInt (bio, 18);
 	 OpenSSL.writeString (bio, domain);
@@ -216,6 +222,21 @@ fun send (bio, m) =
 		       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))
+      | MsgMysqlFixperms => OpenSSL.writeInt (bio, 38)
+      | MsgDescribe dom => (OpenSSL.writeInt (bio, 39);
+			    OpenSSL.writeString (bio, dom))
+      | MsgDescription s => (OpenSSL.writeInt (bio, 40);
+			     OpenSSL.writeString (bio, s))
+      | MsgReUsers => OpenSSL.writeInt (bio, 41)
 
 fun checkIt v =
     case v of
@@ -270,9 +291,9 @@ fun recv bio =
 				(SOME dbtype, SOME passwd) =>
 				SOME (MsgCreateDbUser {dbtype = dbtype, passwd = passwd})
 			      | _ => NONE)
-		   | 17 => (case (OpenSSL.readString bio, OpenSSL.readString bio) of
-				(SOME dbtype, SOME dbname) =>
-				SOME (MsgCreateDbTable {dbtype = dbtype, dbname = dbname})
+		   | 17 => (case (OpenSSL.readString bio, OpenSSL.readString bio, recvOption OpenSSL.readString bio) of
+				(SOME dbtype, SOME dbname, SOME encoding) =>
+				SOME (MsgCreateDb {dbtype = dbtype, dbname = dbname, encoding = encoding})
 			      | _ => NONE)
 		   | 18 => (case (OpenSSL.readString bio, OpenSSL.readString bio,
 				  OpenSSL.readString bio, OpenSSL.readString bio) of
@@ -315,6 +336,20 @@ fun recv bio =
 		   | 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
+		   | 39 => Option.map MsgDescribe (OpenSSL.readString bio)
+		   | 40 => Option.map MsgDescription (OpenSSL.readString bio)
+		   | 41 => SOME MsgReUsers
 		   | _ => NONE)
 	 
 end