diff --git a/bakanet/src/bakanet/sock_layer/socket.h b/bakanet/src/bakanet/sock_layer/socket.h index 538ab20..ccc2d0c 100755 --- a/bakanet/src/bakanet/sock_layer/socket.h +++ b/bakanet/src/bakanet/sock_layer/socket.h @@ -23,9 +23,9 @@ namespace Bk::Net { virtual void emit(std::vector packet) = 0; virtual void emit(Connection socket, std::vector packet) = 0; virtual std::vector obtain(int size) = 0; - virtual std::vector obtain(Connection socket, int size) = 0; - virtual std::vector obtain() = 0; - virtual std::vector obtain(Connection socket) = 0; + virtual std::vector obtain(Connection conn, int size) = 0; + virtual std::vector nobtain() = 0; + virtual std::vector nobtain(Connection conn) = 0; template static bool set_option(Socket& socket, int level, int option_name, const T* option_value) diff --git a/bakanet/src/platform/linux/linux_socket.cpp b/bakanet/src/platform/linux/linux_socket.cpp index ef339c9..7581fdc 100755 --- a/bakanet/src/platform/linux/linux_socket.cpp +++ b/bakanet/src/platform/linux/linux_socket.cpp @@ -87,11 +87,11 @@ namespace Bk::Net { return buffer; } - virtual std::vector obtain() + std::vector LinuxSocket::nobtain() { std::vector buffer(0); int len = 0; - ioctl(sock, FIONREAD, &len); + ioctl(socket_id, FIONREAD, &len); if (len > 0) { buffer.resize(len); len = read(socket_id, buffer.data(), buffer.size() - 1); @@ -99,11 +99,11 @@ namespace Bk::Net { return buffer; } - virtual std::vector obtain(Connection socket) + std::vector LinuxSocket::nobtain(Connection conn) { std::vector buffer(0); int len = 0; - ioctl(sock, FIONREAD, &len); + ioctl(socket_id, FIONREAD, &len); if (len > 0) { buffer.resize(len); len = read(conn, buffer.data(), buffer.size() - 1); diff --git a/bakanet/src/platform/linux/linux_socket.h b/bakanet/src/platform/linux/linux_socket.h index fadf8ff..600d767 100755 --- a/bakanet/src/platform/linux/linux_socket.h +++ b/bakanet/src/platform/linux/linux_socket.h @@ -19,9 +19,9 @@ namespace Bk::Net { void emit(std::vector packet) override; void emit(Connection socket, std::vector packet) override; std::vector obtain(int size) override; - std::vector obtain(Connection socket, int size) override; - std::vector obtain() override; - std::vector obtain(Connection socket) override; + std::vector obtain(Connection conn, int size) override; + std::vector nobtain() override; + std::vector nobtain(Connection conn) override; private: Connection socket_id;