aboutsummaryrefslogtreecommitdiffstats
path: root/src/websockets/qwebsocketserver.h
diff options
context:
space:
mode:
authorHeiko Voigt <hvoigt@hvoigt.net>2019-03-14 17:53:07 +0100
committerHeiko Voigt <hvoigt@hvoigt.net>2019-04-29 16:28:50 +0000
commit2e54dbe86eac61e87782a138dbcc158cb6b10cd9 (patch)
tree0e2e813d54c7f4e51798868d870a65bc252d0848 /src/websockets/qwebsocketserver.h
parent240f14a7a7b56c3eb6c2bdd34ab9c9ee4bca2990 (diff)
websocket server: add timeout to abort incomplete handshakes
A websocket connection can involve two types of handshakes. First an optional SSL handshake and second the websocket handshake itself. Either one can get stalled/stuck if the other side does not answer. To be robust by default and for easy mitigation by users of websockets let's introduce a handshake timeout. We introduce a default timeout of 10 seconds which can be customized by the newly introduced setHandshakeTimeout() method. One major location where connections got stuck was when the connection queue was filled with connections waiting for the SSL handshake. Only connections that have finished this handshake can be processed anyway so we now add them to the queue once they are fully ready to start the websocket handshake. Task-number: QTBUG-63312 Task-number: QTBUG-57026 Change-Id: Ia286221f1d8da1000e98973496280fde16ed811d Reviewed-by: Alf Crüger <a.crueger@baxi-innotech.de> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/websockets/qwebsocketserver.h')
-rw-r--r--src/websockets/qwebsocketserver.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h
index 17d5376..dd06448 100644
--- a/src/websockets/qwebsocketserver.h
+++ b/src/websockets/qwebsocketserver.h
@@ -86,6 +86,9 @@ public:
void setMaxPendingConnections(int numConnections);
int maxPendingConnections() const;
+ void setHandshakeTimeout(int msec);
+ int handshakeTimeout() const;
+
quint16 serverPort() const;
QHostAddress serverAddress() const;
QUrl serverUrl() const;