diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-11-18 11:35:33 +0100 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-11-18 11:35:33 +0100 |
commit | 3e11e9019b8cc8adbe4558d25530caaf88e83718 (patch) | |
tree | 7db8eb523b68e4d897f2fbf808c5fa03513122e2 /lib/Socket.cpp | |
parent | 2152cd24f4176199797673729316fab752daca76 (diff) | |
download | dabmux-3e11e9019b8cc8adbe4558d25530caaf88e83718.tar.gz dabmux-3e11e9019b8cc8adbe4558d25530caaf88e83718.tar.bz2 dabmux-3e11e9019b8cc8adbe4558d25530caaf88e83718.zip |
Apply common 23752f6 and e10272e
Diffstat (limited to 'lib/Socket.cpp')
-rw-r--r-- | lib/Socket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Socket.cpp b/lib/Socket.cpp index 50a12ba..bfbef93 100644 --- a/lib/Socket.cpp +++ b/lib/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) { |