Fixed interruption of data reception over HTTPS

awwit · awwit · commit 51f8d206489e · 2017-11-13T02:33:01.000+03:00
diff --git a/projects/qt-creator/httpserverapp.qbs.user b/projects/qt-creator/httpserverapp.qbs.user
diff --git a/src/socket/AdapterTls.cpp b/src/socket/AdapterTls.cpp
@@ -82,8 +82,9 @@ namespace Socket
 
 			do {
 				sock.nonblock_send_sync();
+				send_size = ::gnutls_record_send(this->session, reinterpret_cast<const uint8_t *>(buf) + total, record_size);
 			}
-			while (GNUTLS_E_AGAIN == (send_size = ::gnutls_record_send(this->session, reinterpret_cast<const uint8_t *>(buf) + total, record_size) ) );
+			while (GNUTLS_E_AGAIN == send_size);
 
 			if (send_size < 0) {
 				return send_size;
@@ -116,10 +117,10 @@ namespace Socket
 		long result;
 
 		do {
-			sock.nonblock_recv_sync();
+			sock.nonblock_recv_sync(timeout);
 			result = ::gnutls_record_recv(this->session, buf, length);
 		}
-		while (result == GNUTLS_E_AGAIN || result == GNUTLS_E_INTERRUPTED);
+		while (result == GNUTLS_E_INTERRUPTED);
 
 		return result;
 	}
diff --git a/src/socket/List.cpp b/src/socket/List.cpp
@@ -1,4 +1,4 @@
-
+﻿
 #include "List.h"
 
 #ifdef POSIX
diff --git a/src/socket/List.h b/src/socket/List.h
@@ -1,4 +1,4 @@
-#pragma once
+﻿#pragma once
 
 #include "Socket.h"
 
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 noexcept
+	void 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, ~0);
+		::WSAPoll(&event, 1, timeout.count() );
 	#elif POSIX
 		struct ::pollfd event = {
 			this->socket_handle,
 			POLLIN,
 			0
 		};
 
-		::poll(&event, 1, ~0);
+		::poll(&event, 1, timeout.count() );
 	#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 noexcept;
+		void 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;
diff --git a/src/utils/Event.cpp b/src/utils/Event.cpp
@@ -32,7 +32,7 @@ namespace Utils
 		if (this->signaled.load() == false) {
 			std::unique_lock<std::mutex> lck(this->mtx);
 
-			is_timeout = false == this->cv.wait_for(lck, ms, [this] { return this->notifed(); } );
+			is_timeout = this->cv.wait_for(lck, ms, [this] { return this->notifed(); } ) == false;
 		}
 
 		if (false == this->manually) {

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,9 @@ namespace Socket`
`82`	`82`
`83`	`83`	`do {`
`84`	`84`	`sock.nonblock_send_sync();`
	`85`	`+ send_size = ::gnutls_record_send(this->session, reinterpret_cast<const uint8_t *>(buf) + total, record_size);`
`85`	`86`	`}`
`86`		`- while (GNUTLS_E_AGAIN == (send_size = ::gnutls_record_send(this->session, reinterpret_cast<const uint8_t *>(buf) + total, record_size) ) );`
	`87`	`+ while (GNUTLS_E_AGAIN == send_size);`
`87`	`88`
`88`	`89`	`if (send_size < 0) {`
`89`	`90`	`return send_size;`
`@@ -116,10 +117,10 @@ namespace Socket`
`116`	`117`	`long result;`
`117`	`118`
`118`	`119`	`do {`
`119`		`- sock.nonblock_recv_sync();`
	`120`	`+ sock.nonblock_recv_sync(timeout);`
`120`	`121`	`result = ::gnutls_record_recv(this->session, buf, length);`
`121`	`122`	`}`
`122`		`- while (result == GNUTLS_E_AGAIN \|\| result == GNUTLS_E_INTERRUPTED);`
	`123`	`+ while (result == GNUTLS_E_INTERRUPTED);`
`123`	`124`
`124`	`125`	`return result;`
`125`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-`
	`1`	`+`
`2`	`2`	`#include "List.h"`
`3`	`3`
`4`	`4`	`#ifdef POSIX`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#pragma once`
	`1`	`+#pragma once`
`2`	`2`
`3`	`3`	`#include "Socket.h"`
`4`	`4`
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 noexcept`
	`292`	`+ void 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, ~0);`
	`301`	`+ ::WSAPoll(&event, 1, timeout.count() );`
`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, ~0);`
	`309`	`+ ::poll(&event, 1, timeout.count() );`
`310`	`310`	`#else`
`311`	`311`	`#error "Undefine platform"`
`312`	`312`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ namespace Utils`
`32`	`32`	`if (this->signaled.load() == false) {`
`33`	`33`	`std::unique_lock<std::mutex> lck(this->mtx);`
`34`	`34`
`35`		`- is_timeout = false == this->cv.wait_for(lck, ms, [this] { return this->notifed(); } );`
	`35`	`+ is_timeout = this->cv.wait_for(lck, ms, [this] { return this->notifed(); } ) == false;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`if (false == this->manually) {`