HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch default web node from mire to navajos
[hcoop/domtool2.git]
/
src
/
msg.sml
diff --git
a/src/msg.sml
b/src/msg.sml
index
ab79885
..
22f548c
100644
(file)
--- a/
src/msg.sml
+++ b/
src/msg.sml
@@
-119,6
+119,8
@@
fun sendQuery (bio, q) =
OpenSSL.writeString (bio, s))
| QFirewall s => (OpenSSL.writeInt (bio, 5);
OpenSSL.writeString (bio, s))
OpenSSL.writeString (bio, s))
| QFirewall s => (OpenSSL.writeInt (bio, 5);
OpenSSL.writeString (bio, s))
+ | QAptExists s => (OpenSSL.writeInt (bio, 6);
+ OpenSSL.writeString (bio, s))
fun recvQuery bio =
case OpenSSL.readInt bio of
fun recvQuery bio =
case OpenSSL.readInt bio of
@@
-130,6
+132,7
@@
fun recvQuery bio =
| 3 => Option.map QTrustedPath (OpenSSL.readString bio)
| 4 => Option.map QSocket (OpenSSL.readString bio)
| 5 => Option.map QFirewall (OpenSSL.readString bio)
| 3 => Option.map QTrustedPath (OpenSSL.readString bio)
| 4 => Option.map QSocket (OpenSSL.readString bio)
| 5 => Option.map QFirewall (OpenSSL.readString bio)
+ | 6 => Option.map QAptExists (OpenSSL.readString bio)
| _ => NONE)
| NONE => NONE
| _ => NONE)
| NONE => NONE
@@
-239,6
+242,9
@@
fun send (bio, m) =
| MsgReUsers => OpenSSL.writeInt (bio, 41)
| MsgVmailChanged => OpenSSL.writeInt (bio, 42)
| MsgFirewallRegen => OpenSSL.writeInt (bio, 43)
| MsgReUsers => OpenSSL.writeInt (bio, 41)
| MsgVmailChanged => OpenSSL.writeInt (bio, 42)
| MsgFirewallRegen => OpenSSL.writeInt (bio, 43)
+ | MsgAptQuery {section, description} => (OpenSSL.writeInt (bio, 44);
+ OpenSSL.writeString (bio, section);
+ OpenSSL.writeString (bio, description))
fun checkIt v =
case v of
fun checkIt v =
case v of
@@
-354,6
+360,9
@@
fun recv bio =
| 41 => SOME MsgReUsers
| 42 => SOME MsgVmailChanged
| 43 => SOME MsgFirewallRegen
| 41 => SOME MsgReUsers
| 42 => SOME MsgVmailChanged
| 43 => SOME MsgFirewallRegen
+ | 44 => (case (OpenSSL.readString bio, OpenSSL.readString bio) of
+ (SOME section, SOME description) => SOME (MsgAptQuery {section = section, description = description})
+ | _ => NONE)
| _ => NONE)
end
| _ => NONE)
end