From e766ee369c75fdfdd41c810582f9ed99349fe672 Mon Sep 17 00:00:00 2001 From: alpine Date: Thu, 18 Jun 2020 22:14:03 +0200 Subject: Finished session id on client and server. Started expirementing with ways to send version. Finished packet wrapper completely. Small code and formatting changes. --- server/src/client/client.cpp | 2 +- server/src/client/client.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'server/src/client') diff --git a/server/src/client/client.cpp b/server/src/client/client.cpp index 18818e7..5e28f26 100644 --- a/server/src/client/client.cpp +++ b/server/src/client/client.cpp @@ -32,7 +32,7 @@ void tcp::client::gen_session() { std::default_random_engine e1(r()); std::uniform_int_distribution gen(33, 126); - for(int i = 0; i < session_id_len; i++) { + for (int i = 0; i < session_id_len; i++) { auto k = static_cast(gen(e1)); m_session_id.insert(m_session_id.end(), k); } diff --git a/server/src/client/client.h b/server/src/client/client.h index b54cd22..f305638 100644 --- a/server/src/client/client.h +++ b/server/src/client/client.h @@ -2,7 +2,6 @@ #include "../server/packet.h" namespace tcp { -constexpr uint8_t client_version = 0; class client { int m_socket; @@ -14,6 +13,8 @@ class client { std::string m_session_id; public: + static constexpr int version = 1; + client() : m_socket{-1} {}; client(const int &socket, const std::string_view ip) : m_socket{std::move(socket)}, m_ip{ip}, m_ssl{nullptr} {} @@ -28,9 +29,12 @@ class client { } 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 read(void *data, size_t size) { return SSL_read(m_ssl, data, size); } int stream(std::vector &data); -- cgit v1.2.3