aboutsummaryrefslogtreecommitdiff
path: root/server/src/client
diff options
context:
space:
mode:
authoralpine <[email protected]>2020-06-18 22:14:03 +0200
committeralpine <[email protected]>2020-06-18 22:14:03 +0200
commite766ee369c75fdfdd41c810582f9ed99349fe672 (patch)
tree257ed7e911b325f22cb8425fbc926bc3cc37eed5 /server/src/client
parentRenamed uid to session id. (diff)
downloadloader-e766ee369c75fdfdd41c810582f9ed99349fe672.tar.xz
loader-e766ee369c75fdfdd41c810582f9ed99349fe672.zip
Finished session id on client and server.
Started expirementing with ways to send version. Finished packet wrapper completely. Small code and formatting changes.
Diffstat (limited to 'server/src/client')
-rw-r--r--server/src/client/client.cpp2
-rw-r--r--server/src/client/client.h6
2 files changed, 6 insertions, 2 deletions
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<int> 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<char>(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<char> &data);