commit 76e5e3aafefda5dba7e3b139e0e6e424a1c8fe00
author William A. Kennington III <wak@google.com> Sun Dec 17 23:16:35 2023 -0800
committer William A. Kennington III <wak@google.com> Sun Dec 24 14:47:21 2023 -0800
tree dc48977f71e4c28b6e533e94965539a4b803ac23
parent 04885c504e21fc124cce8296d92603fc94259183

fd/ops: Fix accept() address return

Error cases and EOF don't return addresses.

Change-Id: I7c72e64f70d7b74f0761edd40e135ffaa2e9e325
Signed-off-by: William A. Kennington III <wak@google.com>

src/fd/impl.cpp

diff --git a/src/fd/impl.cpp b/src/fd/impl.cpp
index 40ce7b3..55efbab 100644
--- a/src/fd/impl.cpp
+++ b/src/fd/impl.cpp
@@ -123,7 +123,7 @@
     CHECK_ERRNO(::listen(get(), backlog), "listen");
 }
 
-std::tuple<std::optional<int>, std::span<std::byte>>
+std::optional<std::tuple<int, std::span<std::byte>>>
     FdImpl::accept(std::span<std::byte> sockaddr)
 {
     socklen_t len = sockaddr.size();
@@ -133,7 +133,7 @@
     {
         if (errno == EAGAIN || errno == EWOULDBLOCK)
         {
-            return {};
+            return std::nullopt;
         }
         throw util::makeSystemError(errno, "accept");
     }