Firewall rule look-up

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

diff --git a/src/msg.sml b/src/msg.sml
index 3c795b2..5b1125b 100644 (file)
--- a/src/msg.sml
+++ b/src/msg.sml
@@ -115,6 +115,8 @@ fun sendQuery (bio, q) =
                           OpenSSL.writeString (bio, s))
       | QSocket s => (OpenSSL.writeInt (bio, 4);
                      OpenSSL.writeString (bio, s))
                           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
 
 fun recvQuery bio =
     case OpenSSL.readInt bio of


@@ -125,6 +127,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)
           | 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
 
           | _ => NONE)
       | NONE => NONE
 


@@ -216,6 +219,8 @@ fun send (bio, m) =
                       sendQuery (bio, q))
       | MsgSocket p => (OpenSSL.writeInt (bio, 33);
                        sendSockPerm (bio, p))
                       sendQuery (bio, q))
       | MsgSocket p => (OpenSSL.writeInt (bio, 33);
                        sendSockPerm (bio, p))

+      | MsgFirewall ls => (OpenSSL.writeInt (bio, 34);
+                          sendList OpenSSL.writeString (bio, ls))

 
 fun checkIt v =
     case v of
 
 fun checkIt v =
     case v of


@@ -315,6 +320,7 @@ fun recv bio =
                   | 31 => SOME MsgNo
                   | 32 => Option.map MsgQuery (recvQuery bio)
                   | 33 => Option.map MsgSocket (recvSockPerm bio)
                   | 31 => SOME MsgNo
                   | 32 => Option.map MsgQuery (recvQuery bio)
                   | 33 => Option.map MsgSocket (recvSockPerm bio)

+                  | 34 => Option.map MsgFirewall (recvList OpenSSL.readString bio)

                   | _ => NONE)
         
 end
                   | _ => NONE)
         
 end