diff options
| -rw-r--r-- | contrib/Socket.cpp | 2 | ||||
| -rw-r--r-- | contrib/Socket.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/Socket.cpp b/contrib/Socket.cpp index 50a12ba..bfbef93 100644 --- a/contrib/Socket.cpp +++ b/contrib/Socket.cpp @@ -650,7 +650,7 @@ ssize_t TCPSocket::recv(void *buffer, size_t length, int flags, int timeout_ms) std::string errstr(strerror(errno)); throw std::runtime_error("TCP receive with poll() error: " + errstr); } - else if (retval > 0 and (fds[0].revents | POLLIN)) { + else if (retval > 0 and (fds[0].revents & POLLIN)) { ssize_t ret = ::recv(m_sock, buffer, length, flags); if (ret == -1) { if (errno == ECONNREFUSED) { diff --git a/contrib/Socket.h b/contrib/Socket.h index df80b08..b9f6317 100644 --- a/contrib/Socket.h +++ b/contrib/Socket.h @@ -258,7 +258,7 @@ class TCPDataDispatcher size_t m_max_queue_size; - std::atomic<bool> m_running; + std::atomic<bool> m_running = ATOMIC_VAR_INIT(false); std::string m_exception_data; std::thread m_listener_thread; TCPSocket m_listener_socket; @@ -285,7 +285,7 @@ class TCPReceiveServer { size_t m_blocksize = 0; ThreadsafeQueue<std::vector<uint8_t> > m_queue; - std::atomic<bool> m_running; + std::atomic<bool> m_running = ATOMIC_VAR_INIT(false); std::string m_exception_data; std::thread m_listener_thread; TCPSocket m_listener_socket; |