mirror of
https://github.com/RGBCube/serenity
synced 2025-05-31 16:18:12 +00:00
LibCore: Move Stream-based sockets into the Core
namespace
This commit is contained in:
parent
d43a7eae54
commit
a96339b72b
123 changed files with 1157 additions and 1100 deletions
|
@ -9,6 +9,7 @@
|
|||
#include <AK/String.h>
|
||||
#include <LibCore/EventLoop.h>
|
||||
#include <LibCore/LocalServer.h>
|
||||
#include <LibCore/Socket.h>
|
||||
#include <LibCore/Stream.h>
|
||||
#include <LibCore/TCPServer.h>
|
||||
#include <LibCore/Timer.h>
|
||||
|
@ -151,11 +152,11 @@ TEST_CASE(file_truncate)
|
|||
|
||||
TEST_CASE(should_error_when_connection_fails)
|
||||
{
|
||||
// NOTE: This is required here because Core::Stream::TCPSocket requires
|
||||
// NOTE: This is required here because Core::TCPSocket requires
|
||||
// Core::EventLoop through Core::Notifier.
|
||||
Core::EventLoop event_loop;
|
||||
|
||||
auto maybe_tcp_socket = Core::Stream::TCPSocket::connect({ { 127, 0, 0, 1 }, 1234 });
|
||||
auto maybe_tcp_socket = Core::TCPSocket::connect({ { 127, 0, 0, 1 }, 1234 });
|
||||
EXPECT(maybe_tcp_socket.is_error());
|
||||
EXPECT(maybe_tcp_socket.error().is_syscall());
|
||||
EXPECT(maybe_tcp_socket.error().code() == ECONNREFUSED);
|
||||
|
@ -175,7 +176,7 @@ TEST_CASE(tcp_socket_read)
|
|||
EXPECT(!tcp_server->listen({ 127, 0, 0, 1 }, 9090).is_error());
|
||||
EXPECT(!tcp_server->set_blocking(true).is_error());
|
||||
|
||||
auto maybe_client_socket = Core::Stream::TCPSocket::connect({ { 127, 0, 0, 1 }, 9090 });
|
||||
auto maybe_client_socket = Core::TCPSocket::connect({ { 127, 0, 0, 1 }, 9090 });
|
||||
EXPECT(!maybe_client_socket.is_error());
|
||||
auto client_socket = maybe_client_socket.release_value();
|
||||
|
||||
|
@ -211,7 +212,7 @@ TEST_CASE(tcp_socket_write)
|
|||
EXPECT(!tcp_server->listen({ 127, 0, 0, 1 }, 9090).is_error());
|
||||
EXPECT(!tcp_server->set_blocking(true).is_error());
|
||||
|
||||
auto maybe_client_socket = Core::Stream::TCPSocket::connect({ { 127, 0, 0, 1 }, 9090 });
|
||||
auto maybe_client_socket = Core::TCPSocket::connect({ { 127, 0, 0, 1 }, 9090 });
|
||||
EXPECT(!maybe_client_socket.is_error());
|
||||
auto client_socket = maybe_client_socket.release_value();
|
||||
|
||||
|
@ -244,7 +245,7 @@ TEST_CASE(tcp_socket_eof)
|
|||
EXPECT(!tcp_server->listen({ 127, 0, 0, 1 }, 9090).is_error());
|
||||
EXPECT(!tcp_server->set_blocking(true).is_error());
|
||||
|
||||
auto maybe_client_socket = Core::Stream::TCPSocket::connect({ { 127, 0, 0, 1 }, 9090 });
|
||||
auto maybe_client_socket = Core::TCPSocket::connect({ { 127, 0, 0, 1 }, 9090 });
|
||||
EXPECT(!maybe_client_socket.is_error());
|
||||
auto client_socket = maybe_client_socket.release_value();
|
||||
|
||||
|
@ -279,7 +280,7 @@ TEST_CASE(udp_socket_read_write)
|
|||
auto udp_server = Core::UDPServer::construct();
|
||||
EXPECT(udp_server->bind({ 127, 0, 0, 1 }, 9090));
|
||||
|
||||
auto maybe_client_socket = Core::Stream::UDPSocket::connect({ { 127, 0, 0, 1 }, 9090 });
|
||||
auto maybe_client_socket = Core::UDPSocket::connect({ { 127, 0, 0, 1 }, 9090 });
|
||||
EXPECT(!maybe_client_socket.is_error());
|
||||
auto client_socket = maybe_client_socket.release_value();
|
||||
|
||||
|
@ -328,7 +329,7 @@ TEST_CASE(local_socket_read)
|
|||
auto local_server = Core::LocalServer::construct();
|
||||
EXPECT(local_server->listen("/tmp/test-socket"));
|
||||
|
||||
local_server->on_accept = [&](NonnullOwnPtr<Core::Stream::LocalSocket> server_socket) {
|
||||
local_server->on_accept = [&](NonnullOwnPtr<Core::LocalSocket> server_socket) {
|
||||
EXPECT(!server_socket->write(sent_data.bytes()).is_error());
|
||||
|
||||
event_loop.quit(0);
|
||||
|
@ -343,7 +344,7 @@ TEST_CASE(local_socket_read)
|
|||
[](auto&) {
|
||||
Core::EventLoop event_loop;
|
||||
|
||||
auto maybe_client_socket = Core::Stream::LocalSocket::connect("/tmp/test-socket");
|
||||
auto maybe_client_socket = Core::LocalSocket::connect("/tmp/test-socket");
|
||||
EXPECT(!maybe_client_socket.is_error());
|
||||
auto client_socket = maybe_client_socket.release_value();
|
||||
|
||||
|
@ -377,7 +378,7 @@ TEST_CASE(local_socket_write)
|
|||
auto local_server = Core::LocalServer::construct();
|
||||
EXPECT(local_server->listen("/tmp/test-socket"));
|
||||
|
||||
local_server->on_accept = [&](NonnullOwnPtr<Core::Stream::LocalSocket> server_socket) {
|
||||
local_server->on_accept = [&](NonnullOwnPtr<Core::LocalSocket> server_socket) {
|
||||
// NOTE: For some reason LocalServer gives us a nonblocking socket..?
|
||||
MUST(server_socket->set_blocking(true));
|
||||
|
||||
|
@ -400,7 +401,7 @@ TEST_CASE(local_socket_write)
|
|||
// NOTE: Same reason as in the local_socket_read test.
|
||||
auto background_action = Threading::BackgroundAction<int>::construct(
|
||||
[](auto&) {
|
||||
auto maybe_client_socket = Core::Stream::LocalSocket::connect("/tmp/test-socket");
|
||||
auto maybe_client_socket = Core::LocalSocket::connect("/tmp/test-socket");
|
||||
EXPECT(!maybe_client_socket.is_error());
|
||||
auto client_socket = maybe_client_socket.release_value();
|
||||
|
||||
|
@ -566,9 +567,9 @@ TEST_CASE(buffered_tcp_socket_read)
|
|||
EXPECT(!tcp_server->listen({ 127, 0, 0, 1 }, 9090).is_error());
|
||||
EXPECT(!tcp_server->set_blocking(true).is_error());
|
||||
|
||||
auto maybe_client_socket = Core::Stream::TCPSocket::connect({ { 127, 0, 0, 1 }, 9090 });
|
||||
auto maybe_client_socket = Core::TCPSocket::connect({ { 127, 0, 0, 1 }, 9090 });
|
||||
EXPECT(!maybe_client_socket.is_error());
|
||||
auto maybe_buffered_socket = Core::Stream::BufferedTCPSocket::create(maybe_client_socket.release_value());
|
||||
auto maybe_buffered_socket = Core::BufferedTCPSocket::create(maybe_client_socket.release_value());
|
||||
EXPECT(!maybe_buffered_socket.is_error());
|
||||
auto client_socket = maybe_buffered_socket.release_value();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue