Fix TCPSocket timeout issues

Author: vdm-dev

include/ur_client_library/comm/pipeline.h

@@ -342,7 +342,6 @@ class Pipeline
     producer_.stopProducer();
     if (pThread_.joinable())
     {
-      printf("Join Thread");
       pThread_.join();
     }
     if (cThread_.joinable())
@@ -397,15 +396,13 @@ class Pipeline
     std::vector<std::unique_ptr<T>> products;
     while (running_)
     {
-      printf("runProducer() is running\n");
       if (!producer_.tryGet(products))
       {
         producer_.teardownProducer();
         running_ = false;
         break;
       }
 
-      printf("runProducer() for loop\n");
       for (auto& p : products)
       {
         if (!queue_.tryEnqueue(std::move(p)))
@@ -416,7 +413,6 @@ class Pipeline
 
       products.clear();
     }
-    printf("runProducer() ended\n");
     URCL_LOG_DEBUG("Pipeline producer ended! <%s>", name_.c_str());
     notifier_.stopped(name_);
   }

src/comm/tcp_socket.cpp

@@ -59,8 +59,8 @@ void TCPSocket::setupOptions()
   if (recv_timeout_ != nullptr)
   {
 #ifdef _WIN32
-    DWORD value = recv_timeout_->tv_usec * 1000;
-    value += recv_timeout_->tv_sec / 1000;
+    DWORD value = recv_timeout_->tv_sec * 1000;
+    value += recv_timeout_->tv_usec / 1000;
     ur_setsockopt(socket_fd_, SOL_SOCKET, SO_RCVTIMEO, &value, sizeof(value));
 #else
     ur_setsockopt(socket_fd_, SOL_SOCKET, SO_RCVTIMEO, recv_timeout_.get(), sizeof(timeval));
@@ -202,7 +202,8 @@ bool TCPSocket::read(uint8_t* buf, const size_t buf_len, size_t& read)
   {
     res = 0;
 #ifdef _WIN32
-    if (::WSAGetLastError() != WSAEWOULDBLOCK)
+    int code = ::WSAGetLastError();
+    if (code != WSAETIMEDOUT && code != WSAEWOULDBLOCK)
     {
       state_ = SocketState::Disconnected;
     }