From f9b06df544c8134b5982b76f2d24aa93289f6d71 Mon Sep 17 00:00:00 2001 From: auth Date: Sat, 11 Jul 2020 17:09:27 +0200 Subject: Added blacklist implementation on server. Overall code cleanup and optimization. --- client/src/assembler/assembler.cpp | 10 +++++----- client/src/assembler/assembler.h | 6 +----- client/src/client/enc.cpp | 3 ++- client/src/main.cpp | 5 ++++- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'client/src') diff --git a/client/src/assembler/assembler.cpp b/client/src/assembler/assembler.cpp index 5311833..cf41ad1 100644 --- a/client/src/assembler/assembler.cpp +++ b/client/src/assembler/assembler.cpp @@ -1,22 +1,22 @@ #include "../include.h" #include "assembler.h" -void assembler::assembler::start() {} +void assembler::start() {} -void assembler::assembler::push(const std::vector& args) { +void assembler::push(const std::vector& args) { if (!m_x64) { for (auto it = args.rbegin(); it != args.rend(); ++it) { m_assembler.push(*it); } return; } - + // 64bit impl } -void assembler::assembler::call(const uintptr_t addr) {} +void assembler::call(const uintptr_t addr) {} -void assembler::assembler::end() { +void assembler::end() { if (m_x64) { } diff --git a/client/src/assembler/assembler.h b/client/src/assembler/assembler.h index 3dcdeaf..00c7362 100644 --- a/client/src/assembler/assembler.h +++ b/client/src/assembler/assembler.h @@ -4,8 +4,6 @@ using namespace asmjit; -namespace assembler { - class assembler { std::vector m_buf; @@ -30,6 +28,4 @@ class assembler { auto &operator()() const { return m_buf; } auto &operator->() const { return m_assembler; } -}; - -}; // namespace assembler \ No newline at end of file +}; \ No newline at end of file diff --git a/client/src/client/enc.cpp b/client/src/client/enc.cpp index 6a7baed..97e1c29 100644 --- a/client/src/client/enc.cpp +++ b/client/src/client/enc.cpp @@ -3,8 +3,9 @@ namespace enc { +std::random_device r; + void encrypt_message(std::string &str) { - std::random_device r; std::default_random_engine e1(r()); std::uniform_int_distribution gen(0, 255); diff --git a/client/src/main.cpp b/client/src/main.cpp index 8e742de..8a1aca0 100644 --- a/client/src/main.cpp +++ b/client/src/main.cpp @@ -6,7 +6,7 @@ int main(int argc, char* argv[]) { io::init(); - /*assembler::assembler a; + /*assembler a; a.push({1, 2, 3, 7, 9}); a.end(); for(auto &b : a()) { @@ -30,8 +30,11 @@ int main(int argc, char* argv[]) { if (action == tcp::packet_action::session) { client.session_id = packet.session_id; + tcp::version_t v{0, 1, 0}; auto version = fmt::format("{}.{}.{}", v.major, v.minor, v.patch); + io::logger->info("current server version {}", message); + if (version != message) { io::logger->error("please update your client."); client.shutdown(); -- cgit v1.2.3