From ed0feac5b5ea8a39a8d83e4d2f62b29b63592b35 Mon Sep 17 00:00:00 2001
From: malloc <aleco@aroltd.com>
Date: Mon, 23 Apr 2018 09:21:58 -0500
Subject: [PATCH] distraction action

---
 server/src/crypto/cipher.hpp      |  1 +
 server/src/hosts/master.hpp       | 21 ++++++++++++++++-----
 server/src/hosts/master_intra.cpp |  6 +++---
 server/src/hosts/slave.cpp        |  3 ---
 server/src/hosts/slave.hpp        |  6 +++---
 server/src/sock/pool.hpp          |  4 ++--
 6 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/server/src/crypto/cipher.hpp b/server/src/crypto/cipher.hpp
index 99d1a81..5fedff9 100644
--- a/server/src/crypto/cipher.hpp
+++ b/server/src/crypto/cipher.hpp
@@ -8,6 +8,7 @@ namespace sosc {
 namespace cgc {
 class Cipher {
 public:
+    Cipher() {};
     Cipher(const KeyExchange& key);
     
     void Parse(std::string* data);
diff --git a/server/src/hosts/master.hpp b/server/src/hosts/master.hpp
index 73bef52..8c1c3d2 100644
--- a/server/src/hosts/master.hpp
+++ b/server/src/hosts/master.hpp
@@ -5,6 +5,9 @@
 #include "../sock/scapesock.hpp"
 #include "../sock/pool.hpp"
 
+#include "../crypto/keyex.hpp"
+#include "../crypto/cipher.hpp"
+
 namespace sosc {
 /** MASTER -> CLIENT **/
     
@@ -12,12 +15,15 @@ class MasterClient {
 public:
     
 private:
-    ScapeConnection client;
+    ScapeConnection sock;
+    
+    cgc::KeyExchange key;
+    cgc::Cipher cipher;
 };
 
 class MasterClientPool : public Pool<MasterClient> {
 protected:
-    bool ProcessClient(MasterClient client) override;
+    bool ProcessClient(MasterClient& client) override;
 };
 
 /** MASTER -> SLAVE **/
@@ -25,15 +31,20 @@ protected:
 class MasterIntra {
 public:
     MasterIntra(IntraClient client);
-    
+    bool Process();
     void Close();
 private:
-    IntraClient client;
+    IntraClient sock;
+    
+    cgc::KeyExchange key;
+    cgc::Cipher cipher;
 };
 
 class MasterIntraPool : public Pool<MasterIntra> {
 protected:
-    bool ProcessClient(MasterIntra client) override;
+    bool ProcessClient(MasterIntra& client) override {
+        return client.Process();
+    }
 };
 }
 
diff --git a/server/src/hosts/master_intra.cpp b/server/src/hosts/master_intra.cpp
index 10fe18d..5150075 100644
--- a/server/src/hosts/master_intra.cpp
+++ b/server/src/hosts/master_intra.cpp
@@ -1,9 +1,9 @@
 #include "master.hpp"
 
 sosc::MasterIntra::MasterIntra(IntraClient client) {
-    this->client = client;
+    this->sock = client;
 }
 
-bool sosc::MasterIntraPool::ProcessClient(MasterIntra client) {
-    
+bool sosc::MasterIntra::Process() {
+    return true;
 }
diff --git a/server/src/hosts/slave.cpp b/server/src/hosts/slave.cpp
index 53b4040..f2c726b 100644
--- a/server/src/hosts/slave.cpp
+++ b/server/src/hosts/slave.cpp
@@ -1,5 +1,2 @@
 #include "slave.hpp"
 
-bool sosc::SlavePool::ProcessClient(SlaveClient* client) {
-    return true;
-}
diff --git a/server/src/hosts/slave.hpp b/server/src/hosts/slave.hpp
index 6a8257d..3ce954a 100644
--- a/server/src/hosts/slave.hpp
+++ b/server/src/hosts/slave.hpp
@@ -7,12 +7,12 @@
 namespace sosc {
 class SlaveClient {
 public:
-    
+    SlaveClient(ScapeConnection client);
 private:
-    ScapeConnection client;
+    ScapeConnection sock;
 };
 
-class SlavePool : public Pool<SlaveClient*> {
+class SlaveClientPool : Pool<SlaveClient*> {
 protected:
     bool ProcessClient(SlaveClient* client) override;
 };
diff --git a/server/src/sock/pool.hpp b/server/src/sock/pool.hpp
index cddd90d..f1584cd 100644
--- a/server/src/sock/pool.hpp
+++ b/server/src/sock/pool.hpp
@@ -42,7 +42,7 @@ public:
     
     void Stop();
 protected:
-    virtual bool ProcessClient(T client) = 0;
+    virtual bool ProcessClient(T& client) = 0;
 private:
     bool IsStackFull(int stackCount) const;
     bool CanAddStack() const;
@@ -239,7 +239,7 @@ void Pool<T>::Stack::Stop() {
         return;
     
     this->is_running = false;
-    this->thread.join();
+    this->thread->join();
     
     delete this->thread;
     this->is_open = false;