Changeset 6 in chevmsgr for trunk/msgsrv.cpp

Timestamp:

08/29/15 02:20:50 (9 years ago)

Author:

cheese

Message:

modify client interface and message protocol

File:

• trunk/msgsrv.cpp (modified) (10 diffs)

trunk/msgsrv.cpp

@@ -283 +283 @@
 }
 
-static bool command(const Message::Parser & parser)
+static bool command(const Protocol::Message & parser)
 {
     bool isContinued = true;
@@ -305 +305 @@
 }
 
-static std::string httpSMS(const Message::Parser & parser)
+static std::string httpSMS(const Protocol::Message & parser)
 {
     std::string phone = parser.get<std::string>("phone");
@@ -319 +319 @@
         CRLF;
 
-    Message::Response response;
+    Protocol::Response response;
     cf::network::tcp smsSock;
     cf::network::host smsServer(url, 80);
@@ -330 +330 @@
 }
 
-static bool join(const Message::Parser & parser, const std::string & sms, const std::string & address)
+static bool join(const Protocol::Message & parser, const std::string & sms, const std::string & address)
     throw (cf::exception)
 {
@@ -342 +342 @@
 }
 
-static bool login(const Message::Parser & parser)
+static bool login(const Protocol::Message & parser)
     throw (cf::exception)
 {
@@ -351 +351 @@
 }
 
-static bool chat(const Message::Parser & parser,
+static bool chat(const Protocol::Message & parser,
                  const std::string & message)
 {
@@ -381 +381 @@
         while (true)
         {
-            Message::Parser parser;
+            Protocol::Message parser;
             parser.parse(sock.receive().toString());
 
@@ -417 +417 @@
         workerInitiator(*sock);
 
-        Message::Response response;
+        Protocol::Response response;
         bool result = true;
 
@@ -423 +423 @@
         {
             std::string message = sock->receive().toString();
-            Message::Parser parser;
+            Protocol::Message parser;
             parser.parse(message);
 
@@ -433 +433 @@
                 result = chat(parser, message);
 
-            sock->send(response.result(result));
+            sock->send(response.result(parser.type(), result));
         }
     }