From 07afb3bc6e983c911c6540d57690d23d5c8effc7 Mon Sep 17 00:00:00 2001 From: anulax1225 Date: Mon, 18 Mar 2024 08:26:02 +0100 Subject: [PATCH] Modified sock code folder name --- .../bakanet/{sock_layer => core}/dns_lookup.h | 0 .../bakanet/{sock_layer => core}/ip_address.h | 0 .../{sock_layer => core}/ip_protocol.h | 0 .../bakanet/{sock_layer => core}/ip_version.h | 0 .../src/bakanet/{sock_layer => core}/packet.h | 0 bakanet/src/bakanet/core/socket.h | 35 +++++++++++++++++++ .../{sock_layer => core}/socket_options.h | 0 bakanet/src/bakanet/sock_layer/socket.h | 34 ------------------ 8 files changed, 35 insertions(+), 34 deletions(-) rename bakanet/src/bakanet/{sock_layer => core}/dns_lookup.h (100%) rename bakanet/src/bakanet/{sock_layer => core}/ip_address.h (100%) rename bakanet/src/bakanet/{sock_layer => core}/ip_protocol.h (100%) rename bakanet/src/bakanet/{sock_layer => core}/ip_version.h (100%) rename bakanet/src/bakanet/{sock_layer => core}/packet.h (100%) create mode 100755 bakanet/src/bakanet/core/socket.h rename bakanet/src/bakanet/{sock_layer => core}/socket_options.h (100%) delete mode 100755 bakanet/src/bakanet/sock_layer/socket.h diff --git a/bakanet/src/bakanet/sock_layer/dns_lookup.h b/bakanet/src/bakanet/core/dns_lookup.h similarity index 100% rename from bakanet/src/bakanet/sock_layer/dns_lookup.h rename to bakanet/src/bakanet/core/dns_lookup.h diff --git a/bakanet/src/bakanet/sock_layer/ip_address.h b/bakanet/src/bakanet/core/ip_address.h similarity index 100% rename from bakanet/src/bakanet/sock_layer/ip_address.h rename to bakanet/src/bakanet/core/ip_address.h diff --git a/bakanet/src/bakanet/sock_layer/ip_protocol.h b/bakanet/src/bakanet/core/ip_protocol.h similarity index 100% rename from bakanet/src/bakanet/sock_layer/ip_protocol.h rename to bakanet/src/bakanet/core/ip_protocol.h diff --git a/bakanet/src/bakanet/sock_layer/ip_version.h b/bakanet/src/bakanet/core/ip_version.h similarity index 100% rename from bakanet/src/bakanet/sock_layer/ip_version.h rename to bakanet/src/bakanet/core/ip_version.h diff --git a/bakanet/src/bakanet/sock_layer/packet.h b/bakanet/src/bakanet/core/packet.h similarity index 100% rename from bakanet/src/bakanet/sock_layer/packet.h rename to bakanet/src/bakanet/core/packet.h diff --git a/bakanet/src/bakanet/core/socket.h b/bakanet/src/bakanet/core/socket.h new file mode 100755 index 0000000..7734a96 --- /dev/null +++ b/bakanet/src/bakanet/core/socket.h @@ -0,0 +1,35 @@ +#pragma once + +#include +#include "ip_address.h" +#include "ip_protocol.h" + +namespace Bk::Net { + + using Connection = int; + + class Socket + { + public: + virtual ~Socket() {} + + virtual bool init() = 0; + virtual bool start(int cpt_conn) = 0; + virtual std::unique_ptr ack() = 0; + virtual bool conn() = 0; + + + virtual int get_raw_socket() = 0; + virtual const std::string get_ip() = 0; + + virtual void emit(std::vector packet) = 0; + virtual std::vector obtain(int size) = 0; + + template + static bool set_option(Socket& socket, int level, int option_name, const T* option_value) { return setsockopt(socket.get_raw_socket(), level, option_name, (void*)option_value, sizeof(T)) == 0 ? true : false; } + + static std::unique_ptr create(IpAddress ip, int port, IpProtocol proto); + protected: + static std::unique_ptr create(int id, IpVersion ver, IpProtocol proto); + }; +} \ No newline at end of file diff --git a/bakanet/src/bakanet/sock_layer/socket_options.h b/bakanet/src/bakanet/core/socket_options.h similarity index 100% rename from bakanet/src/bakanet/sock_layer/socket_options.h rename to bakanet/src/bakanet/core/socket_options.h diff --git a/bakanet/src/bakanet/sock_layer/socket.h b/bakanet/src/bakanet/sock_layer/socket.h deleted file mode 100755 index bb39f65..0000000 --- a/bakanet/src/bakanet/sock_layer/socket.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include -#include "ip_address.h" -#include "ip_protocol.h" - -namespace Bk::Net { - - using Connection = int; - - class Socket - { - public: - virtual ~Socket() {} - - virtual bool init() = 0; - virtual bool start(int cpt_conn) = 0; - virtual std::unique_ptr ack() = 0; - virtual bool conn() = 0; - - - virtual int get_raw_socket() = 0; - virtual const std::string get_ip() = 0; - - virtual void emit(std::vector packet) = 0; - virtual std::vector obtain(int size) = 0; - - template - static bool set_option(Socket& socket, int level, int option_name, const T* option_value) { return setsockopt(socket.get_raw_socket(), level, option_name, (void*)option_value, sizeof(T)) == 0 ? true : false; } - - static std::unique_ptr create(IpAddress ip, int port, IpProtocol proto); - static std::unique_ptr create(int id, IpVersion ver, IpProtocol proto); - }; -} \ No newline at end of file