RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 19:27:35 +00:00
Code Issues Activity Actions

LibCore: Make CTCPServer's local address/port getters return Optionals

Browse source
This commit is contained in:
Andreas Kling 2019-11-04 13:07:41 +01:00
parent e4c80961d9
commit 43a6c70c2a
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Libraries/LibCore/CTCPServer.cpp
View file

@ -1,8 +1,8 @@
#include <AK/IPv4Address.h> #include <AK/IPv4Address.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <LibCore/CNotifier.h>
#include <LibCore/CTCPServer.h> #include <LibCore/CTCPServer.h>
#include <LibCore/CTCPSocket.h> #include <LibCore/CTCPSocket.h>
#include <LibCore/CNotifier.h>
#include <stdio.h> #include <stdio.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -54,7 +54,7 @@ RefPtr<CTCPSocket> CTCPServer::accept()
return CTCPSocket::construct(accepted_fd); return CTCPSocket::construct(accepted_fd);
} }
IPv4Address CTCPServer::local_address() const Optional<IPv4Address> CTCPServer::local_address() const
{ {
if (m_fd == -1) if (m_fd == -1)
return {}; return {};
@ -62,20 +62,20 @@ IPv4Address CTCPServer::local_address() const
sockaddr_in address; sockaddr_in address;
socklen_t len = sizeof(address); socklen_t len = sizeof(address);
if (getsockname(m_fd, (sockaddr*)&address, &len) != 0) if (getsockname(m_fd, (sockaddr*)&address, &len) != 0)
return 0; return {};
return IPv4Address(address.sin_addr.s_addr); return IPv4Address(address.sin_addr.s_addr);
} }
u16 CTCPServer::local_port() const Optional<u16> CTCPServer::local_port() const
{ {
if (m_fd == -1) if (m_fd == -1)
return 0; return {};
sockaddr_in address; sockaddr_in address;
socklen_t len = sizeof(address); socklen_t len = sizeof(address);
if (getsockname(m_fd, (sockaddr*)&address, &len) != 0) if (getsockname(m_fd, (sockaddr*)&address, &len) != 0)
return 0; return {};
return ntohs(address.sin_port); return ntohs(address.sin_port);
} }

4
Libraries/LibCore/CTCPServer.h
View file

@ -16,8 +16,8 @@ public:
RefPtr<CTCPSocket> accept(); RefPtr<CTCPSocket> accept();
IPv4Address local_address() const; Optional<IPv4Address> local_address() const;
u16 local_port() const; Optional<u16> local_port() const;
Function<void()> on_ready_to_accept; Function<void()> on_ready_to_accept;