Added client version control.

Reverted back to google formatting.

2 files changed, 96 insertions, 105 deletions

diff --git a/server/src/client/client.cpp b/server/src/client/client.cpp
index b82b5a4..4313e85 100644
--- a/server/src/client/client.cpp
+++ b/server/src/client/client.cpp
@@ -2,91 +2,88 @@
 #include "../util/io.h"
 #include "client.h"
 
-bool tcp::client::init_ssl(SSL_CTX* server_ctx)
-{
-    m_ssl = SSL_new(server_ctx);
-    if(!m_ssl) {
-        io::logger->error("failed to create ssl on client {}.", m_ip);
-        return false;
-    }
-
-    int ret = SSL_set_fd(m_ssl, m_socket);
-    if(ret <= 0) {
-        io::logger->error("failed to set descriptor on client {}.", m_ip);
-        return false;
-    }
-
-    ret = SSL_accept(m_ssl);
-
-    if(ret <= 0) {
-        int err = SSL_get_error(m_ssl, ret);
-        io::logger->error("client {} failed to accept ssl, return code {}", m_ip, err);
-        return false;
-    }
-
-    return true;
+bool tcp::client::init_ssl(SSL_CTX* server_ctx) {
+  m_ssl = SSL_new(server_ctx);
+  if (!m_ssl) {
+    io::logger->error("failed to create ssl on client {}.", m_ip);
+    return false;
+  }
+
+  int ret = SSL_set_fd(m_ssl, m_socket);
+  if (ret <= 0) {
+    io::logger->error("failed to set descriptor on client {}.", m_ip);
+    return false;
+  }
+
+  ret = SSL_accept(m_ssl);
+
+  if (ret <= 0) {
+    int err = SSL_get_error(m_ssl, ret);
+    io::logger->error("client {} failed to accept ssl, return code {}", m_ip,
+                      err);
+    return false;
+  }
+
+  return true;
 }
 
-void tcp::client::gen_session()
-{
-    std::random_device                 r;
-    std::default_random_engine         e1(r());
-    std::uniform_int_distribution<int> gen(33, 126);
+void tcp::client::gen_session() {
+  std::random_device r;
+  std::default_random_engine e1(r());
+  std::uniform_int_distribution<int> gen(33, 126);
 
-    for(int i = 0; i < session_id_len; i++) {
-        auto k = static_cast<char>(gen(e1));
-        m_session_id.insert(m_session_id.end(), k);
-    }
+  for (int i = 0; i < session_id_len; i++) {
+    auto k = static_cast<char>(gen(e1));
+    m_session_id.insert(m_session_id.end(), k);
+  }
 }
 
-int tcp::client::stream(std::vector<char>& data)
-{
-    auto size = data.size();
-
-    auto networked_size = htonl(size);
-    write(&networked_size, sizeof(networked_size));
+int tcp::client::stream(std::vector<char>& data) {
+  auto size = data.size();
 
-    // with 4kb chunk size, speed peaks at 90mb/s
-    constexpr size_t chunk_size = 4096;
-    size_t           sent       = 0;
+  auto networked_size = htonl(size);
+  write(&networked_size, sizeof(networked_size));
 
-    while(size > 0) {
-        auto to_send = std::min(size, chunk_size);
+  // with 4kb chunk size, speed peaks at 90mb/s
+  constexpr size_t chunk_size = 4096;
+  size_t sent = 0;
 
-        int ret = write(&data[sent], to_send);
-        if(ret <= 0) {
-            break;
-        }
+  while (size > 0) {
+    auto to_send = std::min(size, chunk_size);
 
-        sent += ret;
-        size -= ret;
+    int ret = write(&data[sent], to_send);
+    if (ret <= 0) {
+      break;
     }
 
-    return sent;
-}
+    sent += ret;
+    size -= ret;
+  }
 
-int tcp::client::read_stream(std::vector<char>& out)
-{
-    size_t size;
-    read(&size, sizeof(size));
+  return sent;
+}
 
-    size = ntohl(size);
-    out.resize(size);
+int tcp::client::read_stream(std::vector<char>& out) {
+  size_t size;
+  read(&size, sizeof(size));
 
-    constexpr size_t chunk_size = 4096;
-    size_t           total      = 0;
+  size = ntohl(size);
+  out.resize(size);
 
-    while(size > 0) {
-        auto to_read = std::min(size, chunk_size);
+  constexpr size_t chunk_size = 4096;
+  size_t total = 0;
 
-        int ret = read(&out[total], to_read);
-        if(ret <= 0) {
-            break;
-        }
+  while (size > 0) {
+    auto to_read = std::min(size, chunk_size);
 
-        size -= ret;
-        total += ret;
+    int ret = read(&out[total], to_read);
+    if (ret <= 0) {
+      break;
     }
 
-    return total;
+    size -= ret;
+    total += ret;
+  }
+
+  return total;
 }
\ No newline at end of file
diff --git a/server/src/client/client.h b/server/src/client/client.h
index 91d826f..07269ff 100644
--- a/server/src/client/client.h
+++ b/server/src/client/client.h
@@ -3,51 +3,45 @@
 
 namespace tcp {
 
-    class client {
-        int  m_socket;
-        SSL* m_ssl;
+class client {
+  int m_socket;
+  SSL* m_ssl;
 
-        time_t m_time;
+  time_t m_time;
 
-        std::string m_ip;
-        std::string m_session_id;
+  std::string m_ip;
+  std::string m_session_id;
 
-    public:
-        static constexpr int version = 1;
+ public:
+  client() : m_socket{-1} {};
+  client(const int& socket, const std::string_view ip)
+      : m_socket{std::move(socket)}, m_ip{ip}, m_ssl{nullptr} {}
+  ~client() = default;
 
-        client() : m_socket{ -1 } {};
-        client(const int& socket, const std::string_view ip)
-            : m_socket{ std::move(socket) }, m_ip{ ip }, m_ssl{ nullptr }
-        {}
-        ~client() = default;
+  bool init_ssl(SSL_CTX* server_ctx);
 
-        bool init_ssl(SSL_CTX* server_ctx);
+  void cleanup() {
+    close(m_socket);
+    SSL_shutdown(m_ssl);
+    SSL_free(m_ssl);
+  }
 
-        void cleanup()
-        {
-            close(m_socket);
-            SSL_shutdown(m_ssl);
-            SSL_free(m_ssl);
-        }
+  int write(void* data, size_t size) { return SSL_write(m_ssl, data, size); }
 
-        int write(void* data, size_t size) { return SSL_write(m_ssl, data, size); }
+  int write(const packet_t& packet) {
+    if (!packet) return 0;
+    return SSL_write(m_ssl, packet.message.data(), packet.message.size());
+  }
 
-        int write(const packet_t& packet)
-        {
-            if(!packet)
-                return 0;
-            return SSL_write(m_ssl, packet.message.data(), packet.message.size());
-        }
+  int read(void* data, size_t size) { return SSL_read(m_ssl, data, size); }
 
-        int read(void* data, size_t size) { return SSL_read(m_ssl, data, size); }
+  int stream(std::vector<char>& data);
+  int read_stream(std::vector<char>& out);
 
-        int stream(std::vector<char>& data);
-        int read_stream(std::vector<char>& out);
+  void gen_session();
 
-        void gen_session();
-
-        int  get_socket() { return m_socket; }
-        auto get_ip() { return m_ip; }
-        auto get_session() { return m_session_id; }
-    };
-}; // namespace tcp
\ No newline at end of file
+  int get_socket() { return m_socket; }
+  auto get_ip() { return m_ip; }
+  auto get_session() { return m_session_id; }
+};
+};  // namespace tcp
\ No newline at end of file