summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
Diffstat (limited to 'src/network')
-rw-r--r--src/network/poller.cpp3
-rw-r--r--src/network/tcp_socket_handler.cpp5
2 files changed, 6 insertions, 2 deletions
diff --git a/src/network/poller.cpp b/src/network/poller.cpp
index 29c4bce..ffc4f2d 100644
--- a/src/network/poller.cpp
+++ b/src/network/poller.cpp
@@ -1,5 +1,6 @@
#include <network/poller.hpp>
#include <logger/logger.hpp>
+#include <utils/timed_events.hpp>
#include <assert.h>
#include <errno.h>
@@ -133,7 +134,7 @@ void Poller::stop_watching_send_events(SocketHandler* socket_handler)
int Poller::poll(const std::chrono::milliseconds& timeout)
{
- if (this->socket_handlers.empty())
+ if (this->socket_handlers.empty() && timeout == utils::no_timeout)
return -1;
#if POLLER == POLL
int nb_events = ::poll(this->fds, this->nfds, timeout.count());
diff --git a/src/network/tcp_socket_handler.cpp b/src/network/tcp_socket_handler.cpp
index c5d254e..1d1eaa7 100644
--- a/src/network/tcp_socket_handler.cpp
+++ b/src/network/tcp_socket_handler.cpp
@@ -213,8 +213,11 @@ ssize_t TCPSocketHandler::do_recv(void* recv_buf, const size_t buf_size)
else if (-1 == size)
{
log_warning("Error while reading from socket: " << strerror(errno));
+ // Remember if we were connecting, or already connected when this
+ // happened, because close() sets this->connecting to false
+ const auto were_connecting = this->connecting;
this->close();
- if (this->connecting)
+ if (were_connecting)
this->on_connection_failed(strerror(errno));
else
this->on_connection_close(strerror(errno));