diff options
Diffstat (limited to 'Kernel/Net')
-rw-r--r-- | Kernel/Net/IPv4Socket.cpp | 8 | ||||
-rw-r--r-- | Kernel/Net/IPv4Socket.h | 2 | ||||
-rw-r--r-- | Kernel/Net/LocalSocket.cpp | 3 | ||||
-rw-r--r-- | Kernel/Net/LocalSocket.h | 2 | ||||
-rw-r--r-- | Kernel/Net/Socket.h | 2 |
5 files changed, 3 insertions, 14 deletions
diff --git a/Kernel/Net/IPv4Socket.cpp b/Kernel/Net/IPv4Socket.cpp index aaf5bfd828..5c9ba42b68 100644 --- a/Kernel/Net/IPv4Socket.cpp +++ b/Kernel/Net/IPv4Socket.cpp @@ -170,14 +170,6 @@ KResult IPv4Socket::connect(FileDescription& description, Userspace<const sockad return protocol_connect(description, should_block); } -void IPv4Socket::attach(FileDescription&) -{ -} - -void IPv4Socket::detach(FileDescription&) -{ -} - bool IPv4Socket::can_read(const FileDescription&, size_t) const { if (m_role == Role::Listener) diff --git a/Kernel/Net/IPv4Socket.h b/Kernel/Net/IPv4Socket.h index 3f492c6309..bc1b0fc6da 100644 --- a/Kernel/Net/IPv4Socket.h +++ b/Kernel/Net/IPv4Socket.h @@ -54,8 +54,6 @@ public: virtual KResult listen(size_t) override; virtual void get_local_address(sockaddr*, socklen_t*) override; virtual void get_peer_address(sockaddr*, socklen_t*) override; - virtual void attach(FileDescription&) override; - virtual void detach(FileDescription&) override; virtual bool can_read(const FileDescription&, size_t) const override; virtual bool can_write(const FileDescription&, size_t) const override; virtual KResultOr<size_t> sendto(FileDescription&, const UserOrKernelBuffer&, size_t, int, Userspace<const sockaddr*>, socklen_t) override; diff --git a/Kernel/Net/LocalSocket.cpp b/Kernel/Net/LocalSocket.cpp index b628d2dc6c..bb15c43d4f 100644 --- a/Kernel/Net/LocalSocket.cpp +++ b/Kernel/Net/LocalSocket.cpp @@ -224,7 +224,7 @@ KResult LocalSocket::listen(size_t backlog) return KSuccess; } -void LocalSocket::attach(FileDescription& description) +KResult LocalSocket::attach(FileDescription& description) { ASSERT(!m_accept_side_fd_open); if (m_connect_side_role == Role::None) { @@ -236,6 +236,7 @@ void LocalSocket::attach(FileDescription& description) } evaluate_block_conditions(); + return KSuccess; } void LocalSocket::detach(FileDescription& description) diff --git a/Kernel/Net/LocalSocket.h b/Kernel/Net/LocalSocket.h index f0025cdb14..ab98dd017e 100644 --- a/Kernel/Net/LocalSocket.h +++ b/Kernel/Net/LocalSocket.h @@ -56,7 +56,7 @@ public: virtual KResult listen(size_t) override; virtual void get_local_address(sockaddr*, socklen_t*) override; virtual void get_peer_address(sockaddr*, socklen_t*) override; - virtual void attach(FileDescription&) override; + virtual KResult attach(FileDescription&) override; virtual void detach(FileDescription&) override; virtual bool can_read(const FileDescription&, size_t) const override; virtual bool can_write(const FileDescription&, size_t) const override; diff --git a/Kernel/Net/Socket.h b/Kernel/Net/Socket.h index 9116617bb1..a4dfaa6d78 100644 --- a/Kernel/Net/Socket.h +++ b/Kernel/Net/Socket.h @@ -105,8 +105,6 @@ public: virtual void get_peer_address(sockaddr*, socklen_t*) = 0; virtual bool is_local() const { return false; } virtual bool is_ipv4() const { return false; } - virtual void attach(FileDescription&) = 0; - virtual void detach(FileDescription&) = 0; virtual KResultOr<size_t> sendto(FileDescription&, const UserOrKernelBuffer&, size_t, int flags, Userspace<const sockaddr*>, socklen_t) = 0; virtual KResultOr<size_t> recvfrom(FileDescription&, UserOrKernelBuffer&, size_t, int flags, Userspace<sockaddr*>, Userspace<socklen_t*>, timeval&) = 0; |