From 9a7eece05eaf334689f49b63393dab6a074272c6 Mon Sep 17 00:00:00 2001 From: anulax1225 Date: Thu, 14 Mar 2024 09:50:15 +0100 Subject: [PATCH] Renamed plaform folder to platform --- .../src/{plaform => platform}/linux/linux_dns_lookup.cpp | 0 .../src/{plaform => platform}/linux/linux_ip_address.cpp | 0 bakanet/src/{plaform => platform}/linux/linux_socket.cpp | 9 +++++---- bakanet/src/{plaform => platform}/linux/linux_socket.h | 3 +++ .../{plaform => platform}/windows/windows_dns_lookup.cpp | 0 .../{plaform => platform}/windows/windows_ip_adress.cpp | 0 .../src/{plaform => platform}/windows/windows_socket.cpp | 0 .../src/{plaform => platform}/windows/windows_socket.h | 0 8 files changed, 8 insertions(+), 4 deletions(-) rename bakanet/src/{plaform => platform}/linux/linux_dns_lookup.cpp (100%) rename bakanet/src/{plaform => platform}/linux/linux_ip_address.cpp (100%) rename bakanet/src/{plaform => platform}/linux/linux_socket.cpp (91%) rename bakanet/src/{plaform => platform}/linux/linux_socket.h (92%) rename bakanet/src/{plaform => platform}/windows/windows_dns_lookup.cpp (100%) rename bakanet/src/{plaform => platform}/windows/windows_ip_adress.cpp (100%) rename bakanet/src/{plaform => platform}/windows/windows_socket.cpp (100%) rename bakanet/src/{plaform => platform}/windows/windows_socket.h (100%) diff --git a/bakanet/src/plaform/linux/linux_dns_lookup.cpp b/bakanet/src/platform/linux/linux_dns_lookup.cpp similarity index 100% rename from bakanet/src/plaform/linux/linux_dns_lookup.cpp rename to bakanet/src/platform/linux/linux_dns_lookup.cpp diff --git a/bakanet/src/plaform/linux/linux_ip_address.cpp b/bakanet/src/platform/linux/linux_ip_address.cpp similarity index 100% rename from bakanet/src/plaform/linux/linux_ip_address.cpp rename to bakanet/src/platform/linux/linux_ip_address.cpp diff --git a/bakanet/src/plaform/linux/linux_socket.cpp b/bakanet/src/platform/linux/linux_socket.cpp similarity index 91% rename from bakanet/src/plaform/linux/linux_socket.cpp rename to bakanet/src/platform/linux/linux_socket.cpp index ef7e8fa..7c7638f 100755 --- a/bakanet/src/plaform/linux/linux_socket.cpp +++ b/bakanet/src/platform/linux/linux_socket.cpp @@ -73,8 +73,9 @@ namespace Bk::Net { { std::vector buffer; buffer.resize(size); - int status = read(socket_id, buffer.data(), buffer.size() - 1); - return status > 0 ? buffer : std::vector(); + int read_size = read(socket_id, buffer.data(), buffer.size() - 1); + buffer.resize(read_size); + return buffer; } std::vector LinuxSocket::obtain(Connection conn, int size) @@ -85,8 +86,8 @@ namespace Bk::Net { buffer.resize(read_size); return buffer; } - - std::unique_ptr Socket::Create(IpAddress ip, int port, IpProtocol proto) + + std::unique_ptr Socket::create(IpAddress ip, int port, IpProtocol proto) { return std::unique_ptr(new LinuxSocket(ip, port, proto)); } diff --git a/bakanet/src/plaform/linux/linux_socket.h b/bakanet/src/platform/linux/linux_socket.h similarity index 92% rename from bakanet/src/plaform/linux/linux_socket.h rename to bakanet/src/platform/linux/linux_socket.h index 5314b55..8ecd699 100755 --- a/bakanet/src/plaform/linux/linux_socket.h +++ b/bakanet/src/platform/linux/linux_socket.h @@ -13,6 +13,9 @@ namespace Bk::Net { bool start(int cpt_conn) override; Connection ack() override; bool conn() override; + + int get_raw_socket() override { return socket_id; } + void emit(std::vector packet) override; void emit(Connection socket, std::vector packet) override; std::vector obtain(int size) override; diff --git a/bakanet/src/plaform/windows/windows_dns_lookup.cpp b/bakanet/src/platform/windows/windows_dns_lookup.cpp similarity index 100% rename from bakanet/src/plaform/windows/windows_dns_lookup.cpp rename to bakanet/src/platform/windows/windows_dns_lookup.cpp diff --git a/bakanet/src/plaform/windows/windows_ip_adress.cpp b/bakanet/src/platform/windows/windows_ip_adress.cpp similarity index 100% rename from bakanet/src/plaform/windows/windows_ip_adress.cpp rename to bakanet/src/platform/windows/windows_ip_adress.cpp diff --git a/bakanet/src/plaform/windows/windows_socket.cpp b/bakanet/src/platform/windows/windows_socket.cpp similarity index 100% rename from bakanet/src/plaform/windows/windows_socket.cpp rename to bakanet/src/platform/windows/windows_socket.cpp diff --git a/bakanet/src/plaform/windows/windows_socket.h b/bakanet/src/platform/windows/windows_socket.h similarity index 100% rename from bakanet/src/plaform/windows/windows_socket.h rename to bakanet/src/platform/windows/windows_socket.h