fix Cylix/cpp_redis#132 (cpp_redis#32) - timeout for connection not w…

…orking due to invalid param to select.
Cylix · Nov 13, 2017 · df072eb · df072eb
1 parent 38b874d
commit df072eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sources/network/unix/unix_tcp_socket.cpp b/sources/network/unix/unix_tcp_socket.cpp
@@ -107,7 +107,7 @@ tcp_socket::connect(const std::string& host, std::uint32_t port, std::uint32_t t
 
     //! 1 means we are connected.
     //! 0/-1 means a timeout.
-    if (select(0, NULL, &set, NULL, &tv) == 1) {
+    if (select(m_fd + 1, NULL, &set, NULL, &tv) == 1) {
       //! Set back to blocking mode as the user of this class is expecting
       if (fcntl(m_fd, F_SETFL, fcntl(m_fd, F_GETFL, 0) & (~O_NONBLOCK)) == -1) {
         close();

diff --git a/sources/network/windows/windows_tcp_socket.cpp b/sources/network/windows/windows_tcp_socket.cpp
@@ -88,7 +88,7 @@ tcp_socket::connect(const std::string& host, std::uint32_t port, std::uint32_t t
 
     //! 1 means we are connected.
     //! 0 means a timeout.
-    if (select(0, NULL, &set, NULL, &tv) == 1) {
+    if (select(static_cast<int>(m_fd) + 1, NULL, &set, NULL, &tv) == 1) {
       //! Set back to blocking mode as the user of this class is expecting
       u_long mode = 0;
       if (ioctlsocket(m_fd, FIONBIO, &mode) != 0) {