1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:17:34 +00:00

LibCore+Userland: Remove Core::TCPSocket :^)

This was deprecated in favor of Core::Stream::TCPSocket, and now has no
users.
This commit is contained in:
sin-ack 2022-02-06 16:05:28 +00:00 committed by Brian Gianforcaro
parent cb57475168
commit 64f135d90f
10 changed files with 1 additions and 83 deletions

View file

@ -9,7 +9,6 @@
#include <LibCore/LocalServer.h>
#include <LibCore/Stream.h>
#include <LibCore/TCPServer.h>
#include <LibCore/TCPSocket.h>
#include <LibCore/Timer.h>
#include <LibCore/UDPServer.h>
#include <LibCore/UDPSocket.h>
@ -141,7 +140,7 @@ TEST_CASE(file_adopt_invalid_fd)
TEST_CASE(should_error_when_connection_fails)
{
// NOTE: This is required here because Core::TCPSocket requires
// NOTE: This is required here because Core::Stream::TCPSocket requires
// Core::EventLoop through Core::Notifier.
Core::EventLoop event_loop;

View file

@ -33,7 +33,6 @@ set(SOURCES
System.cpp
SystemServerTakeover.cpp
TCPServer.cpp
TCPSocket.cpp
TempFile.cpp
Timer.cpp
UDPServer.cpp

View file

@ -10,7 +10,6 @@
#include <LibCore/Notifier.h>
#include <LibCore/System.h>
#include <LibCore/TCPServer.h>
#include <LibCore/TCPSocket.h>
namespace Core {

View file

@ -1,50 +0,0 @@
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibCore/TCPSocket.h>
#include <errno.h>
#include <sys/socket.h>
#ifndef SOCK_NONBLOCK
# include <sys/ioctl.h>
#endif
namespace Core {
TCPSocket::TCPSocket(int fd, Object* parent)
: Socket(Socket::Type::TCP, parent)
{
// NOTE: This constructor is used by TCPServer::accept(), so the socket is already connected.
m_connected = true;
set_fd(fd);
set_mode(OpenMode::ReadWrite);
set_error(0);
}
TCPSocket::TCPSocket(Object* parent)
: Socket(Socket::Type::TCP, parent)
{
#ifdef SOCK_NONBLOCK
int fd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
#else
int fd = socket(AF_INET, SOCK_STREAM, 0);
int option = 1;
ioctl(fd, FIONBIO, &option);
#endif
if (fd < 0) {
set_error(errno);
} else {
set_fd(fd);
set_mode(OpenMode::ReadWrite);
set_error(0);
}
}
TCPSocket::~TCPSocket()
{
}
}

View file

@ -1,24 +0,0 @@
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/Badge.h>
#include <LibCore/Socket.h>
namespace Core {
class TCPSocket final : public Socket {
C_OBJECT(TCPSocket)
public:
virtual ~TCPSocket() override;
private:
TCPSocket(int fd, Object* parent = nullptr);
explicit TCPSocket(Object* parent = nullptr);
};
}

View file

@ -8,7 +8,6 @@
#include <AK/Optional.h>
#include <LibCore/NetworkJob.h>
#include <LibCore/TCPSocket.h>
#include <LibGemini/GeminiRequest.h>
#include <LibGemini/GeminiResponse.h>

View file

@ -9,7 +9,6 @@
#include <LibCompress/Gzip.h>
#include <LibCompress/Zlib.h>
#include <LibCore/Event.h>
#include <LibCore/TCPSocket.h>
#include <LibHTTP/HttpResponse.h>
#include <LibHTTP/Job.h>
#include <stdio.h>

View file

@ -10,7 +10,6 @@
#include <AK/HashMap.h>
#include <AK/Optional.h>
#include <LibCore/NetworkJob.h>
#include <LibCore/TCPSocket.h>
#include <LibHTTP/HttpRequest.h>
#include <LibHTTP/HttpResponse.h>

View file

@ -9,7 +9,6 @@
#include <AK/URL.h>
#include <AK/Vector.h>
#include <LibCore/Object.h>
#include <LibCore/TCPSocket.h>
#include <LibTLS/TLSv12.h>
#include <LibWebSocket/Message.h>

View file

@ -15,7 +15,6 @@
#include <LibCore/ElapsedTimer.h>
#include <LibCore/EventLoop.h>
#include <LibCore/NetworkJob.h>
#include <LibCore/TCPSocket.h>
#include <LibCore/Timer.h>
#include <LibTLS/TLSv12.h>