From e7957db1738273baa30abe17ad1a609de2a5983e Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 27 Jul 2019 10:57:30 +0200 Subject: [PATCH] LibCore: Remove CSocket's bind() and listen(). We're going to be using dedicated server socket classes instead. This was only implemented for CLocalSocket, and clients have been switched over to using CLocalServer. --- Libraries/LibCore/CLocalSocket.cpp | 8 -------- Libraries/LibCore/CLocalSocket.h | 2 -- Libraries/LibCore/CSocket.cpp | 7 ------- Libraries/LibCore/CSocket.h | 4 ---- Libraries/LibCore/CTCPSocket.cpp | 5 ----- Libraries/LibCore/CTCPSocket.h | 2 -- 6 files changed, 28 deletions(-) diff --git a/Libraries/LibCore/CLocalSocket.cpp b/Libraries/LibCore/CLocalSocket.cpp index 73355faa84..53e13e3889 100644 --- a/Libraries/LibCore/CLocalSocket.cpp +++ b/Libraries/LibCore/CLocalSocket.cpp @@ -26,11 +26,3 @@ CLocalSocket::CLocalSocket(CObject* parent) CLocalSocket::~CLocalSocket() { } - -bool CLocalSocket::bind(const CSocketAddress& address) -{ - auto un = address.to_sockaddr_un(); - int rc = ::bind(fd(), (const sockaddr*)&un, sizeof(un)); - set_error(errno); - return rc == 0; -} diff --git a/Libraries/LibCore/CLocalSocket.h b/Libraries/LibCore/CLocalSocket.h index aab1546561..0c2f4a5f89 100644 --- a/Libraries/LibCore/CLocalSocket.h +++ b/Libraries/LibCore/CLocalSocket.h @@ -11,6 +11,4 @@ public: explicit CLocalSocket(CObject* parent = nullptr); CLocalSocket(Badge, int fd, CObject* parent = nullptr); virtual ~CLocalSocket() override; - - virtual bool bind(const CSocketAddress&) override; }; diff --git a/Libraries/LibCore/CSocket.cpp b/Libraries/LibCore/CSocket.cpp index 636dc179d5..ca83b97be5 100644 --- a/Libraries/LibCore/CSocket.cpp +++ b/Libraries/LibCore/CSocket.cpp @@ -131,13 +131,6 @@ bool CSocket::send(const ByteBuffer& data) return true; } -bool CSocket::listen() -{ - int rc = ::listen(fd(), 5); - set_error(errno); - return rc == 0; -} - void CSocket::did_update_fd(int fd) { if (fd < 0) { diff --git a/Libraries/LibCore/CSocket.h b/Libraries/LibCore/CSocket.h index 7aac4008f9..ef73b0c563 100644 --- a/Libraries/LibCore/CSocket.h +++ b/Libraries/LibCore/CSocket.h @@ -22,10 +22,6 @@ public: bool connect(const CSocketAddress&, int port); bool connect(const CSocketAddress&); - virtual bool bind(const CSocketAddress&) = 0; - - bool listen(); - ByteBuffer receive(int max_size); bool send(const ByteBuffer&); diff --git a/Libraries/LibCore/CTCPSocket.cpp b/Libraries/LibCore/CTCPSocket.cpp index d7194124af..5f3702a482 100644 --- a/Libraries/LibCore/CTCPSocket.cpp +++ b/Libraries/LibCore/CTCPSocket.cpp @@ -17,8 +17,3 @@ CTCPSocket::CTCPSocket(CObject* parent) CTCPSocket::~CTCPSocket() { } - -bool CTCPSocket::bind(const CSocketAddress&) -{ - ASSERT_NOT_REACHED(); -} diff --git a/Libraries/LibCore/CTCPSocket.h b/Libraries/LibCore/CTCPSocket.h index 71d0f8ea9a..d7e72fb824 100644 --- a/Libraries/LibCore/CTCPSocket.h +++ b/Libraries/LibCore/CTCPSocket.h @@ -5,6 +5,4 @@ class CTCPSocket final : public CSocket { public: explicit CTCPSocket(CObject* parent = nullptr); virtual ~CTCPSocket() override; - - virtual bool bind(const CSocketAddress&) override; };