Changeset 8 in chevmsgr for trunk/msgclnt.cpp

Timestamp:

08/30/15 00:01:12 (9 years ago)

Author:

cheese

Message:

클라 UI 쪼끔 수정
프로토콜 메시지 좀 수정
클라 메시지 핸들링 추가

File:

• trunk/msgclnt.cpp (modified) (4 diffs)

trunk/msgclnt.cpp

@@ -2 +2 @@
 #include "msgclnt.h"
 #include "msg.hpp"
+
+#include <algorithm>
 
 #include <stdlib.h>
@@ -182 +184 @@
 std::vector<SFriend> chev::getFriendList()
 {
+    std::vector<SFriend> friendList;
+
     try
     {
         socket.send(request.getFriendList());
-    }
-    catch (cf::exception & e)
-    {
-        LOG(e.what());
-    }
-    return std::vector<SFriend>();
-}
-
-std::string chev::getSessionID(const std::vector<std::string> & idList)
-{
-    try
-    {
+
+        friendList = messageQ.pop(ProtocolType::FRIEND_LIST).getFriendList();
+    }
+    catch (cf::exception & e)
+    {
+        LOG(e.what());
+    }
+
+    return friendList;
+}
+
+std::string chev::getSessionID(std::vector<std::string> & idList)
+{
+    try
+    {
+        if (idList.size() == 2)
+            std::sort(idList.begin(), idList.end());
+
         std::string concat = idList[0];
 
-        for (int iter = 1 ; iter < idList.size() ; iter++)
-            concat += "," + idList[iter];
+        for (int iter = 1; iter < idList.size(); iter++)
+            concat += DELIMITER + idList[iter];
 
         if (sessionMap.find(concat) == sessionMap.end())
@@ -206 +216 @@
             socket.send(request.openSession(concat));
 
-            std::string response = socket.receive().toString();
-            Protocol::Message parser;
-            parser.parse(response);
-
-            if (!parser.get<bool>("result"))
+            Protocol::Message message = messageQ.pop(ProtocolType::SESSION_ID);
+
+            if (!message.get<bool>(ProtocolType::RESULT))
                 THROW_EXCEPTION("failed to open session id");
 
-            sessionMap[concat] = parser.get<std::string>("sess-id");
+            sessionMap[concat] = message.get<std::string>(ProtocolType::SESSION_ID);
         }
 
@@ -247 +255 @@
 {
     SConversation c;
-    Protocol::Message parser = messageQ.pop(ProtocolType::CHAT);
-
-    c.sessid    = parser.get<std::string>(ProtocolType::SESSION_ID);
-    c.message   = parser.get<std::string>(ProtocolType::MESSAGE);
-    c.sensitive = parser.get<int>(ProtocolType::SENSITIVE);
-    c.isError   = parser.get<bool>(ProtocolType::RESULT);
-
-    c.from      = parser.get<std::string>(ProtocolType::FROM);
+    Protocol::Message message = messageQ.pop(ProtocolType::CHAT);
+
+    c.sessid    = message.get<std::string>(ProtocolType::SESSION_ID);
+    c.message   = message.get<std::string>(ProtocolType::MESSAGE);
+    c.sensitive = message.get<int>(ProtocolType::SENSITIVE);
+    c.isError   = message.get<bool>(ProtocolType::RESULT);
+
+    c.from      = message.get<std::string>(ProtocolType::FROM);
 
     return c;