From 1fa74c016f910c1b15a82d0f7aab51a8d4507177 Mon Sep 17 00:00:00 2001 From: anulax1225 Date: Mon, 18 Mar 2024 19:37:31 +0100 Subject: [PATCH] Added log init function because of errors --- bakanet/premake5.lua | 1 + bakanet/src/bakanet/http/http_server.cpp | 11 ++++------- bakanet/src/platform/linux/linux_socket.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/bakanet/premake5.lua b/bakanet/premake5.lua index 66dfefa..b06b1dd 100755 --- a/bakanet/premake5.lua +++ b/bakanet/premake5.lua @@ -3,6 +3,7 @@ project "bakanet" language "C++" cppdialect "C++17" systemversion "latest" + staticruntime "on" targetdir("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}") objdir("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}") diff --git a/bakanet/src/bakanet/http/http_server.cpp b/bakanet/src/bakanet/http/http_server.cpp index f8961a9..ec52128 100755 --- a/bakanet/src/bakanet/http/http_server.cpp +++ b/bakanet/src/bakanet/http/http_server.cpp @@ -2,6 +2,8 @@ namespace Bk::Net { HttpServer::HttpServer(IpAddress ip, int port) { + Bk::Log::init("BAKANET"); + BK_CORE_INFO("NEW SERVER"); socket = Socket::create(ip, port, IpProtocol::TCP); } @@ -21,13 +23,8 @@ namespace Bk::Net { HttpRequest HttpServer::recv_request(Socket& conn) { Packet req; - bool reading = true; - while(reading) - { - auto data = conn.obtain(1024); - req.append_data(data); - reading = data.size() >= 1024; - } + std::vector data; + while((data = conn.obtain(1024)).size() >= 1024) req.append_data(data); int req_size = req.size(); if (req_size) return HttpRequest(std::string(req.pull(req_size).release(), req_size)); return HttpRequest("", "", ""); diff --git a/bakanet/src/platform/linux/linux_socket.cpp b/bakanet/src/platform/linux/linux_socket.cpp index 91de320..297c1a1 100755 --- a/bakanet/src/platform/linux/linux_socket.cpp +++ b/bakanet/src/platform/linux/linux_socket.cpp @@ -17,7 +17,7 @@ namespace Bk::Net { //LinuxSocket creation step if ((id = socket((int)ip_addr.version, (int)ip_proto, 0)) < 0) { - BK_CORE_TRACE("Socket failed : {0}", strerror(errno)); + BK_CORE_ERROR("Socket failed"); exit(EXIT_FAILURE); } addr.sin_addr = ip_addr.get_data(); @@ -36,7 +36,7 @@ namespace Bk::Net { int status; if ((status = bind(id, (struct sockaddr*)&addr, sizeof(addr)) < 0)) { - BK_CORE_TRACE("Binding failed : {0}", strerror(errno)); + BK_CORE_ERROR("Binding failed"); return false; } return true; @@ -47,7 +47,7 @@ namespace Bk::Net { //Listening step if (listen(id, cpt_conn) < 0) { - BK_CORE_TRACE("Listening failed : {0}", strerror(errno)); + BK_CORE_ERROR("Listening failed"); return false; } return true; @@ -63,7 +63,7 @@ namespace Bk::Net { { if (connect(id, (struct sockaddr*)&addr, sizeof(addr)) < 0) { - BK_CORE_TRACE("Connection failed : {0}", strerror(errno)); + BK_CORE_ERROR("Connection failed"); return false; } return true;