Changeset 5 in chevmsgr

Timestamp:

08/27/15 00:29:54 (9 years ago)

Author:

cheese

Message:

클라이언트 메시지 추가 및 안정화

Location:

trunk

Files:

• msg.cpp (modified) (1 diff)
• msg.hpp (modified) (1 diff)
• msgclnt.cpp (modified) (5 diffs)
• msgclnt.h (modified) (1 diff)

trunk/msg.cpp

@@ -40 +40 @@
 
         obj["command"] = cmd;
+
+        return json::Serialize(obj);
+    }
+
+    std::string Request::sms(const std::string & phone) const
+    {
+        DECLARE_TEMPLATE_OBJECT(obj, "sms");
+
+        obj["phone"] = phone;
+
+        return json::Serialize(obj);
+    }
+
+    std::string Request::join(const std::string & id, const std::string & pw, const std::string & sms)
+    {
+        DECLARE_TEMPLATE_OBJECT(obj, "join");
+
+        obj["id" ] = id;
+        obj["pw" ] = pw;
+        obj["sms"] = sms;
 
         return json::Serialize(obj);

trunk/msg.hpp

@@ -71 +71 @@
         std::string command(const std::string & cmd) const;
 
+        std::string sms(const std::string & phone) const;
+
+        std::string Request::join(const std::string & id, const std::string & pw, const std::string & sms);
+
         std::string login(const std::string & pw) const;
 

trunk/msgclnt.cpp

@@ -19 +19 @@
     bool isError = false;
     Message::Parser parser;
+    cf::bin raw;
 
     while (true)
@@ -24 +25 @@
         try
         {
-            std::string message = inst->socket->receive().toString();
-            parser.parse(message);
+            raw = inst->socket->receive();
+            parser.parse(raw.toString());
 
             isError = false;
@@ -32 +33 @@
         {
             LOG(e.stackTrace());
+
+            // closed
+            if (raw.size() == 0)
+                break;
 
             isError = true;
@@ -86 +91 @@
 }
 
+bool chev::join(const std::string & id, const std::string & pw, const std::string & sms)
+{
+    try
+    {
+        socket.send(request.join(id, pw, sms));
+
+        std::string response = socket.receive().toString();
+        Message::Parser parser;
+        parser.parse(response);
+
+        return parser.get<bool>("result");
+    }
+    catch (cf::exception & e)
+    {
+        LOG(e.what());
+
+        return false;
+    }
+}
+
 bool chev::login(const std::string & id, const std::string & pw)
 {
@@ -108 +133 @@
 }
 
+bool chev::sms(const std::string & phone)
+{
+    try
+    {
+        socket.send(request.sms(phone));
+
+        std::string response = socket.receive().toString();
+        Message::Parser parser;
+        parser.parse(response);
+
+        return parser.get<bool>("result");
+    }
+    catch (cf::exception & e)
+    {
+        LOG(e.what());
+
+        return false;
+    }
+}
+
 bool chev::runReceiver(const SCallback & cb)
 {
+    if (listener.isRunning())
+        return true;
+
     callback = cb;
 

trunk/msgclnt.h

@@ -54 +54 @@
     bool connect(const std::string & host, unsigned short port);
 
-    bool sms();
+    bool sms(const std::string & phone);
 
     bool join(const std::string & id, const std::string & pw, const std::string & sms);