Changeset 13 in chevmsgr for trunk/msgsrv.cpp

Timestamp:

08/30/15 16:54:31 (9 years ago)

Author:

cheese

Message:

서버 쪼끔 수정

File:

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

trunk/msgsrv.cpp

@@ -4 +4 @@
 #include "cf/codec.h"
 #include "cf/file.h"
+#include "crypto.h"
 
 #include "msg.hpp"
@@ -283 +284 @@
 }
 
-static bool command(const Protocol::Message & parser)
-{
-    bool isContinued = true;
-    std::string command = parser.get<std::string>("command");
-
-    if (command == "logout")
-        isContinued = false;
-    /*
-    else if (...)
-    */
-
-    return isContinued;
-}
-
 static std::string getRandomCode()
 {
@@ -333 +320 @@
     throw (cf::exception)
 {
-    if (sms != parser.get<std::string>("sms"))
+    if (sms != parser.get<std::string>(ProtocolType::SMS))
         THROW_EXCEPTION("SMS is not same");
 
-    std::string id = parser.get<std::string>("id");
-    std::string pw = parser.get<std::string>("pw");
+    std::string id = parser.get<std::string>(ProtocolType::ID);
+    std::string pw = parser.get<std::string>(ProtocolType::PW);
         
     return dbmgr.join(id, pw, sms, address);
@@ -345 +332 @@
     throw (cf::exception)
 {
-    std::string id = parser.get<std::string>("id");
-    std::string pw = parser.get<std::string>("pw");
+    std::string id = parser.get<std::string>(ProtocolType::ID);
+    std::string pw = parser.get<std::string>(ProtocolType::PW);
 
     return dbmgr.login(id, pw);
@@ -355 +342 @@
 {
     bool result = false;
-    std::string to = parser.get<std::string>("to");
+    std::string to = parser.get<std::string>(ProtocolType::TO);
 
     if (isOnline(to))
@@ -366 +353 @@
 }
 
+static std::string createSessionID(std::string & idList)
+{
+    cf::bin sessid;
+
+    sessid = crypto().sha256(cf::bin(idList));
+
+    return cf::codec::hex::getInstance()->encode(sessid);
+}
+
+static bool opensession(const Protocol::Message & parser)
+{
+    bool result = false;
+    std::string sessid;
+    std::vector<std::string> idList = parser.getList<std::string>(ProtocolType::ID_LIST);
+    std::string concat = idList[0];
+
+    for (size_t iter = 1; iter < concat.size(); iter++)
+        concat += idList[iter]; 
+
+    sessid = createSessionID(concat);
+
+    for (size_t iter = 0; iter < idList.size(); iter++)
+    {
+        if (isOnline(idList[iter]))
+            gOnlineUsers[idList[iter]].sock->send(sessid);
+
+        result = true;
+    }
+
+    return result;
+}
+
 static std::string keyExchange(const std::string sms, const std::string address)
 {
-    std::string sessionKey;
-
-
+    cf::bin sessKey;
+
+    sessKey = crypto().sha256(cf::bin(sms + address));
+
+    return cf::codec::hex::getInstance()->encode(sessKey);
 }
 
@@ -391 +412 @@
             {
                 if (join(parser, sms, sock.peer().address()))
-                    THROW_EXCEPTION("user(" << parser.get<std::string>("id") << ") cannot join");
+                    THROW_EXCEPTION("user(" << parser.get<std::string>(ProtocolType::ID) << ") cannot join");
             }
             else if (parser.type() == "login")
             {
                 if (login(parser))
-                    return parser.get<std::string>("id");
-            }
+                    parser.get<std::string>(ProtocolType::ID);
+            }           
         }
     }
@@ -428 +449 @@
             LOG(message);
 
-            if (parser.type() == "command")
-                result = command(parser);
-            else if (parser.type() == "chat")
+            if (parser.type() == "chat")
                 result = chat(parser, message);
+            else if (parser.type() == "opensession")
+                result = opensession(parser);
+//          else if (parser.type() == "getFriendList")
+//              result = 
 
             sock->send(response.result(parser.type(), result));
@@ -481 +504 @@
 }
 
-int createSessionID(std::string & idList)
-{
-    return 0;
-}
-
 int main(int argc, char ** argv)
 {