# HG changeset patch # User alfadur # Date 1556659786 -10800 # Node ID e088bd03812d7b2aed9915eee38a95c845868d06 # Parent 90cf07c60febb438bd57f5d5a7b30c37eb72d8de upgrade to QSslSocket diff -r 90cf07c60feb -r e088bd03812d QTfrontend/net/newnetclient.cpp --- a/QTfrontend/net/newnetclient.cpp Wed May 01 00:01:56 2019 +0300 +++ b/QTfrontend/net/newnetclient.cpp Wed May 01 00:29:46 2019 +0300 @@ -85,7 +85,18 @@ netClientState = Connecting; mynick = nick; myhost = hostName + QString(":%1").arg(port); - NetSocket.connectToHost(hostName, port); + if (useTls) + { + NetSocket.connectToHostEncrypted(hostName, port); + if (!NetSocket.waitForEncrypted()) + { + qWarning("Handshake failed"); + } + } + else + { + NetSocket.connectToHost(hostName, port); + } } void HWNewNet::Disconnect() diff -r 90cf07c60feb -r e088bd03812d QTfrontend/net/newnetclient.h --- a/QTfrontend/net/newnetclient.h Wed May 01 00:01:56 2019 +0300 +++ b/QTfrontend/net/newnetclient.h Wed May 01 00:29:46 2019 +0300 @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "team.h" @@ -69,7 +69,7 @@ QString mynick; QString myroom; QString myhost; - QTcpSocket NetSocket; + QSslSocket NetSocket; QString seed; bool m_game_connected; bool m_nick_registered;