Changeset 17 in chevmsgr

Timestamp:

11/22/15 19:53:51 (8 years ago)

Author:

cheese

Message:

msg.cpp에 SecureSocket 추가
서버 암호통신 구현
client 일부 수정

Location:

trunk

Files:

• msg.hpp (modified) (2 diffs)
• msgclnt.h (modified) (2 diffs)
• msgsrv.cpp (modified) (4 diffs)

trunk/msg.hpp

@@ -2 +2 @@
 
 #include "cf/logger.h"
+#include "cf/network.h"
 
 #include "json.h"
+#include "crypto.h"
 
 #include <iostream>
@@ -164 +166 @@
     return concat;
 }
+
+
+class SecureSocket
+{
+private :
+    cf::network::tcp * sock;
+    crypto aria;
+
+public :
+    SecureSocket() {}
+    SecureSocket(cf::network::tcp * sock, cf::bin & key)
+    {
+        init(sock, key);
+    }
+
+    void init(cf::network::tcp * sock, cf::bin & key)
+    {
+        this->sock = sock;
+        aria.setKey(key);
+    }
+
+    void send(const std::string & msg)
+    {
+        sock->send(aria.encrypt(cf::bin(msg)));
+    }
+    
+    std::string receive()
+    {
+        return aria.decrypt(sock->receive()).toString();
+    }
+
+    void close()
+    {
+        sock->close();
+    }
+};

trunk/msgclnt.h

@@ -2 +2 @@
 
 #include <string>
+#include <list>
 #include <vector>
 
@@ -36 +37 @@
 private:
     cf::task::mutex                 mutex;
-    std::vector<Protocol::Message>  messageQ;
+    std::list<Protocol::Message>    messageQ;
 
 public:

trunk/msgsrv.cpp

@@ -16 +16 @@
 // --------------------------------------------------------------
 
-typedef struct LoginSession
-{
-    cf::network::tcp * sock;
-    cf::bin key;
-} LoginSession;
-std::map<std::string, LoginSession> gOnlineUsers;
+std::map<std::string, SecureSocket> gOnlineUsers;
 std::map<std::string, std::vector<std::string> > gSessionMap;
 
@@ -368 +363 @@
         cf::bin key = crypto().sha256(seed);
 
-        LoginSession loginSess;
-
-        loginSess.sock = &sock;
-        loginSess.key = key;
-        gOnlineUsers[id] = loginSess;
+        gOnlineUsers[id] = SecureSocket(&sock, key);
     }
 
@@ -393 +384 @@
 
         if (sender != id && isOnline(id))
-            gOnlineUsers[id].sock->send(serialized);
+            gOnlineUsers[id].send(serialized);
 
         result = true;
@@ -427 +418 @@
         std::string id = idList[iter];
         if (isOnline(id))
-            gOnlineUsers[id].sock->send(serialized);
+            gOnlineUsers[id].send(serialized);
 
         result = true;