Browse Source

Fixed socket error code EINPROGRESS

Paul-Louis Ageneau 5 years ago
parent
commit
dbc706b69d
2 changed files with 2 additions and 2 deletions
  1. 1 1
      deps/libjuice
  2. 1 1
      src/tcptransport.cpp

+ 1 - 1
deps/libjuice

@@ -1 +1 @@
-Subproject commit 2f39a25a12c30f30cc2c749c8610e8ca526c1cac
+Subproject commit 796495852665fb74c0637c069c2abed6392ed4c8

+ 1 - 1
src/tcptransport.cpp

@@ -202,7 +202,7 @@ void TcpTransport::connect(const sockaddr *addr, socklen_t addrlen) {
 
 
 		// Initiate connection
 		// Initiate connection
 		int ret = ::connect(mSock, addr, addrlen);
 		int ret = ::connect(mSock, addr, addrlen);
-		if (ret < 0 && errno != EINPROGRESS) {
+		if (ret < 0 && sockerrno != SEINPROGRESS && sockerrno != SEWOULDBLOCK) {
 			std::ostringstream msg;
 			std::ostringstream msg;
 			msg << "TCP connection to " << node << ":" << serv << " failed, errno=" << sockerrno;
 			msg << "TCP connection to " << node << ":" << serv << " failed, errno=" << sockerrno;
 			throw std::runtime_error(msg.str());
 			throw std::runtime_error(msg.str());