Trying fix intrrution of data reception. Again

awwit · awwit · commit b9c1a2801013 · 2017-11-13T03:19:20.000+03:00
diff --git a/src/socket/AdapterTls.cpp b/src/socket/AdapterTls.cpp
@@ -76,8 +76,6 @@ namespace Socket
 				record_size = length - total;
 			}
 
-		//	const long send_size = ::gnutls_record_send(this->session, reinterpret_cast<const uint8_t *>(buf) + total, record_size);
-
 			long send_size = 0;
 
 			do {
@@ -110,17 +108,18 @@ namespace Socket
 
 	long AdapterTls::nonblock_recv(void *buf, const size_t length, const std::chrono::milliseconds &timeout) const noexcept
 	{
-	//	::gnutls_record_set_timeout(this->session, static_cast<const unsigned int>(timeout.count() ) );
-
 		Socket sock(this->get_handle() );
 
 		long result;
 
 		do {
-			sock.nonblock_recv_sync(timeout);
+			if (sock.nonblock_recv_sync(timeout) == false) {
+				break;
+			}
+
 			result = ::gnutls_record_recv(this->session, buf, length);
 		}
-		while (result == GNUTLS_E_INTERRUPTED);
+		while (GNUTLS_E_AGAIN == result ||GNUTLS_E_INTERRUPTED == result);
 
 		return result;
 	}
diff --git a/src/socket/Socket.cpp b/src/socket/Socket.cpp
@@ -289,7 +289,7 @@ namespace Socket
 		return recv_len;
 	}
 
-	void Socket::nonblock_recv_sync(const std::chrono::milliseconds &timeout) const noexcept
+	bool Socket::nonblock_recv_sync(const std::chrono::milliseconds &timeout) const noexcept
 	{
 	#ifdef WIN32
 		WSAPOLLFD event = {
@@ -298,15 +298,15 @@ namespace Socket
 			0
 		};
 
-		::WSAPoll(&event, 1, timeout.count() );
+		return ::WSAPoll(&event, 1, timeout.count() ) == 1;
 	#elif POSIX
 		struct ::pollfd event = {
 			this->socket_handle,
 			POLLIN,
 			0
 		};
 
-		::poll(&event, 1, timeout.count() );
+		return ::poll(&event, 1, timeout.count() ) == 1;
 	#else
 		#error "Undefine platform"
 	#endif
diff --git a/src/socket/Socket.h b/src/socket/Socket.h
@@ -51,7 +51,7 @@ namespace Socket
 		long nonblock_recv(std::vector<std::string::value_type> &buf, const std::chrono::milliseconds &timeout) const noexcept;
 		long nonblock_recv(void *buf, const size_t length, const std::chrono::milliseconds &timeout) const noexcept;
 
-		void nonblock_recv_sync(const std::chrono::milliseconds &timeout) const noexcept;
+		bool nonblock_recv_sync(const std::chrono::milliseconds &timeout) const noexcept;
 
 		long send(const std::string &buf) const noexcept;
 		long send(const void *buf, const size_t length) const noexcept;

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ namespace Socket`
`289`	`289`	`return recv_len;`
`290`	`290`	`}`
`291`	`291`
`292`		`- void Socket::nonblock_recv_sync(const std::chrono::milliseconds &timeout) const noexcept`
	`292`	`+ bool Socket::nonblock_recv_sync(const std::chrono::milliseconds &timeout) const noexcept`
`293`	`293`	`{`
`294`	`294`	`#ifdef WIN32`
`295`	`295`	`WSAPOLLFD event = {`
`@@ -298,15 +298,15 @@ namespace Socket`
`298`	`298`	`0`
`299`	`299`	`};`
`300`	`300`
`301`		`- ::WSAPoll(&event, 1, timeout.count() );`
	`301`	`+ return ::WSAPoll(&event, 1, timeout.count() ) == 1;`
`302`	`302`	`#elif POSIX`
`303`	`303`	`struct ::pollfd event = {`
`304`	`304`	`this->socket_handle,`
`305`	`305`	`POLLIN,`
`306`	`306`	`0`
`307`	`307`	`};`
`308`	`308`
`309`		`- ::poll(&event, 1, timeout.count() );`
	`309`	`+ return ::poll(&event, 1, timeout.count() ) == 1;`
`310`	`310`	`#else`
`311`	`311`	`#error "Undefine platform"`
`312`	`312`	`#endif`