From 43a6c70c2a6d9d1453ebd63c898f3a26128f6a93 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 4 Nov 2019 13:07:41 +0100 Subject: [PATCH] LibCore: Make CTCPServer's local address/port getters return Optionals --- Libraries/LibCore/CTCPServer.cpp | 12 ++++++------ Libraries/LibCore/CTCPServer.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Libraries/LibCore/CTCPServer.cpp b/Libraries/LibCore/CTCPServer.cpp index 190eacf6bd..3b5420bc5d 100644 --- a/Libraries/LibCore/CTCPServer.cpp +++ b/Libraries/LibCore/CTCPServer.cpp @@ -1,8 +1,8 @@ #include #include +#include #include #include -#include #include #include @@ -54,7 +54,7 @@ RefPtr CTCPServer::accept() return CTCPSocket::construct(accepted_fd); } -IPv4Address CTCPServer::local_address() const +Optional CTCPServer::local_address() const { if (m_fd == -1) return {}; @@ -62,20 +62,20 @@ IPv4Address CTCPServer::local_address() const sockaddr_in address; socklen_t len = sizeof(address); if (getsockname(m_fd, (sockaddr*)&address, &len) != 0) - return 0; + return {}; return IPv4Address(address.sin_addr.s_addr); } -u16 CTCPServer::local_port() const +Optional CTCPServer::local_port() const { if (m_fd == -1) - return 0; + return {}; sockaddr_in address; socklen_t len = sizeof(address); if (getsockname(m_fd, (sockaddr*)&address, &len) != 0) - return 0; + return {}; return ntohs(address.sin_port); } diff --git a/Libraries/LibCore/CTCPServer.h b/Libraries/LibCore/CTCPServer.h index dcf6c54363..0539b3734f 100644 --- a/Libraries/LibCore/CTCPServer.h +++ b/Libraries/LibCore/CTCPServer.h @@ -16,8 +16,8 @@ public: RefPtr accept(); - IPv4Address local_address() const; - u16 local_port() const; + Optional local_address() const; + Optional local_port() const; Function on_ready_to_accept;