aboutsummaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authoralpine <[email protected]>2020-06-25 22:00:27 +0200
committeralpine <[email protected]>2020-06-25 22:00:27 +0200
commit6350a2c2e8fe1b95ec03e3903f3a5de5af92d009 (patch)
tree877fe1aa10005c344633ade1a27d307b5149fcc8 /server
parentUpdate c-cpp.yml (diff)
downloadloader-6350a2c2e8fe1b95ec03e3903f3a5de5af92d009.tar.xz
loader-6350a2c2e8fe1b95ec03e3903f3a5de5af92d009.zip
Removed xor on streaming for now.
Diffstat (limited to 'server')
-rw-r--r--server/src/client/client.cpp9
-rw-r--r--server/src/client/client.h2
-rw-r--r--server/src/include.h1
-rw-r--r--server/src/main.cpp4
-rw-r--r--server/src/util/io.h8
5 files changed, 9 insertions, 15 deletions
diff --git a/server/src/client/client.cpp b/server/src/client/client.cpp
index 452c234..75b25f2 100644
--- a/server/src/client/client.cpp
+++ b/server/src/client/client.cpp
@@ -53,15 +53,12 @@ int tcp::client::stream(std::vector<char>& data, float *dur/*= nullptr*/) {
while (size > 0) {
auto to_send = std::min(size, chunk_size);
- std::string chunk(&data[sent], to_send);
- enc::encrypt_message(chunk);
- int ret = write(chunk.data(), chunk.size());
+ int ret = write(&data[sent], to_send);
if (ret <= 0) {
break;
}
-
- sent += ret - 2;
- size -= ret - 2;
+ sent += ret;
+ size -= ret;
}
auto end = std::chrono::steady_clock::now();
diff --git a/server/src/client/client.h b/server/src/client/client.h
index 01dc125..9459eb6 100644
--- a/server/src/client/client.h
+++ b/server/src/client/client.h
@@ -28,8 +28,6 @@ class client {
}
int write(const void* data, size_t size) {
- //std::string str(reinterpret_cast<const char*>(data), size);
- //enc::encrypt_message(str);
return SSL_write(m_ssl, data, size);
}
diff --git a/server/src/include.h b/server/src/include.h
index eb31336..19e3972 100644
--- a/server/src/include.h
+++ b/server/src/include.h
@@ -22,7 +22,6 @@
#include <utility>
#include <atomic>
#include <mutex>
-#include <filesystem>
#include <arpa/inet.h>
#include <netdb.h>
diff --git a/server/src/main.cpp b/server/src/main.cpp
index df3a577..b4cb3cb 100644
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -55,7 +55,7 @@ int main(int argc, char* argv[]) {
client.get_session());
client.write(resp);
- std::vector<char> t;
+ /*std::vector<char> t;
io::read_file("test.dll", t);
float tot;
for(int i = 0; i < 100; i++) {
@@ -64,7 +64,7 @@ int main(int argc, char* argv[]) {
tot += dur;
}
float avg = tot / 100.f;
- io::logger->info("average time {}", avg);
+ io::logger->info("average time {}", avg);*/
});
diff --git a/server/src/util/io.h b/server/src/util/io.h
index e8ef3f0..4681fbf 100644
--- a/server/src/util/io.h
+++ b/server/src/util/io.h
@@ -1,8 +1,8 @@
#pragma once
namespace io {
- extern std::shared_ptr<spdlog::logger> logger;
+extern std::shared_ptr<spdlog::logger> logger;
- void init(const bool& to_file);
- void read_file(const std::string_view name, std::vector<char>& out);
-}; // namespace io
+void init(const bool& to_file);
+void read_file(const std::string_view name, std::vector<char>& out);
+}; // namespace io