aboutsummaryrefslogtreecommitdiff
path: root/server/src/client
diff options
context:
space:
mode:
authoralpine <[email protected]>2020-06-18 22:19:30 +0200
committeralpine <[email protected]>2020-06-18 22:19:30 +0200
commitc880bb35ac9b0744be38a66b6e8860464fe304ed (patch)
treee81ebc8fd5dc9614534bafaeb9e39a089738a94d /server/src/client
parentFinished session id on client and server. (diff)
downloadloader-c880bb35ac9b0744be38a66b6e8860464fe304ed.tar.xz
loader-c880bb35ac9b0744be38a66b6e8860464fe304ed.zip
Changed clang format style.
Diffstat (limited to 'server/src/client')
-rw-r--r--server/src/client/client.cpp133
-rw-r--r--server/src/client/client.h68
2 files changed, 104 insertions, 97 deletions
diff --git a/server/src/client/client.cpp b/server/src/client/client.cpp
index 5e28f26..b82b5a4 100644
--- a/server/src/client/client.cpp
+++ b/server/src/client/client.cpp
@@ -2,88 +2,91 @@
#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();
+int tcp::client::stream(std::vector<char>& data)
+{
+ auto size = data.size();
- auto networked_size = htonl(size);
- write(&networked_size, sizeof(networked_size));
+ auto networked_size = htonl(size);
+ write(&networked_size, sizeof(networked_size));
- // with 4kb chunk size, speed peaks at 90mb/s
- constexpr size_t chunk_size = 4096;
- size_t sent = 0;
+ // with 4kb chunk size, speed peaks at 90mb/s
+ constexpr size_t chunk_size = 4096;
+ size_t sent = 0;
- while (size > 0) {
- auto to_send = std::min(size, chunk_size);
+ while(size > 0) {
+ auto to_send = std::min(size, chunk_size);
- int ret = write(&data[sent], to_send);
- if (ret <= 0) {
- break;
- }
+ int ret = write(&data[sent], to_send);
+ if(ret <= 0) {
+ break;
+ }
- sent += ret;
- size -= ret;
- }
+ sent += ret;
+ size -= ret;
+ }
- return sent;
+ return sent;
}
-int tcp::client::read_stream(std::vector<char> &out) {
- size_t size;
- read(&size, sizeof(size));
+int tcp::client::read_stream(std::vector<char>& out)
+{
+ size_t size;
+ read(&size, sizeof(size));
- size = ntohl(size);
- out.resize(size);
+ size = ntohl(size);
+ out.resize(size);
- constexpr size_t chunk_size = 4096;
- size_t total = 0;
+ constexpr size_t chunk_size = 4096;
+ size_t total = 0;
- while (size > 0) {
- auto to_read = std::min(size, chunk_size);
+ while(size > 0) {
+ auto to_read = std::min(size, chunk_size);
- int ret = read(&out[total], to_read);
- if (ret <= 0) {
- break;
- }
+ int ret = read(&out[total], to_read);
+ if(ret <= 0) {
+ break;
+ }
- size -= ret;
- total += ret;
- }
+ size -= ret;
+ total += ret;
+ }
- return total;
+ return total;
} \ No newline at end of file
diff --git a/server/src/client/client.h b/server/src/client/client.h
index f305638..91d826f 100644
--- a/server/src/client/client.h
+++ b/server/src/client/client.h
@@ -3,47 +3,51 @@
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:
+ 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} {}
- ~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