Socket: remove wait helper members

mporsch · Aug 5, 2023 · a16f587 · a16f587
1 parent acf720d
commit a16f587
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/src/socket_buffered_impl.cpp b/src/socket_buffered_impl.cpp
@@ -25,7 +25,7 @@ BufferPtr SocketBufferedImpl::GetBuffer()
 
 std::optional<BufferPtr> SocketBufferedImpl::Receive(Duration timeout)
 {
-  if(!this->sock->WaitReadable(timeout)) {
+  if(!WaitReadableBlocking(this->sock->fd, timeout)) {
     return {std::nullopt}; // timeout exceeded
   }
   return SocketBufferedImpl::Receive();
@@ -46,7 +46,7 @@ BufferPtr SocketBufferedImpl::Receive()
 std::optional<std::pair<BufferPtr, Address>>
 SocketBufferedImpl::ReceiveFrom(Duration timeout)
 {
-  if(!this->sock->WaitReadable(timeout)) {
+  if(!WaitReadableBlocking(this->sock->fd, timeout)) {
     return {std::nullopt}; // timeout exceeded
   }
   return SocketBufferedImpl::ReceiveFrom();

diff --git a/src/socket_impl.cpp b/src/socket_impl.cpp
@@ -161,7 +161,7 @@ size_t SocketImpl::Receive(char *data, size_t size)
 std::optional<std::pair<size_t, Address>>
 SocketImpl::ReceiveFrom(char *data, size_t size, Duration timeout)
 {
-  if(!WaitReadable(timeout)) {
+  if(!WaitReadableBlocking(fd, timeout)) {
     return {std::nullopt}; // timeout exceeded
   }
   return {ReceiveFrom(data, size)};
@@ -206,7 +206,7 @@ size_t SocketImpl::SendSome(char const *data, size_t size)
 size_t SocketImpl::SendTo(char const *data, size_t size,
     SockAddrView const &dstAddr, Duration timeout)
 {
-  if(!WaitWritable(timeout)) {
+  if(!WaitWritableBlocking(fd, timeout)) {
     return 0U; // timeout exceeded
   }
   return SendTo(data, size, dstAddr);
@@ -255,7 +255,7 @@ void SocketImpl::Listen()
 std::optional<std::pair<SocketTcp, Address>>
 SocketImpl::Accept(Duration timeout)
 {
-  if(!WaitReadable(timeout)) {
+  if(!WaitReadableBlocking(fd, timeout)) {
     return {std::nullopt}; // timeout exceeded
   }
   return Accept();
@@ -271,16 +271,6 @@ std::pair<SocketTcp, Address> SocketImpl::Accept()
   };
 }
 
-bool SocketImpl::WaitReadable(Duration timeout)
-{
-  return WaitReadableBlocking(fd, timeout);
-}
-
-bool SocketImpl::WaitWritable(Duration timeout)
-{
-  return WaitWritableBlocking(fd, timeout);
-}
-
 void SocketImpl::SetSockOptNonBlocking()
 {
   SetBlocking(fd, false, "failed to set socket option non-blocking");

diff --git a/src/socket_impl.h b/src/socket_impl.h
@@ -71,9 +71,6 @@ struct SocketImpl
   Accept(Duration timeout);
   virtual std::pair<SocketTcp, Address> Accept();
 
-  bool WaitReadable(Duration timeout);
-  bool WaitWritable(Duration timeout);
-
   void SetSockOptNonBlocking();
   void SetSockOptReuseAddr();
   void SetSockOptBroadcast();

diff --git a/src/socket_tls_impl.cpp b/src/socket_tls_impl.cpp
@@ -362,15 +362,15 @@ bool SocketTlsImpl::HandleError(int error)
     return true;
   case SSL_ERROR_WANT_READ:
     return std::visit([this](auto &&d) -> bool {
-      auto readable = WaitReadable(d.Remaining());
+      auto readable = WaitReadableBlocking(fd, d.Remaining());
       d.Tick();
       return readable;
     }, deadline);
   case SSL_ERROR_WANT_WRITE:
     return std::visit([this](auto &&d) -> bool {
-      auto readable = WaitWritable(d.Remaining());
+      auto writable = WaitWritableBlocking(fd, d.Remaining());
       d.Tick();
-      return readable;
+      return writable;
     }, deadline);
   case SSL_ERROR_SSL:
     throw std::system_error(SslError(error), errorMessage);