diff options
author | Björn Hagemeister | 2014-05-12 18:04:17 +0200 |
---|---|---|
committer | Björn Hagemeister | 2014-05-12 18:04:17 +0200 |
commit | 838e5ac0f437649f4afbb27de68e4dcfaf84c6da (patch) | |
tree | c4e94e6edf1177e47804559554bba156542cc5ef /src/server/net | |
parent | Sinec c++11 is enabled by default, set flag to stop annoying warnings. (diff) | |
download | pvs2-838e5ac0f437649f4afbb27de68e4dcfaf84c6da.tar.gz pvs2-838e5ac0f437649f4afbb27de68e4dcfaf84c6da.tar.xz pvs2-838e5ac0f437649f4afbb27de68e4dcfaf84c6da.zip |
Configured not locking the screen, if manager and client working on same machine.
Plus changing symbol for tutor2all button.
Diffstat (limited to 'src/server/net')
-rw-r--r-- | src/server/net/client.cpp | 13 | ||||
-rw-r--r-- | src/server/net/client.h | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp index 412ee10..4bb19bf 100644 --- a/src/server/net/client.cpp +++ b/src/server/net/client.cpp @@ -17,7 +17,7 @@ #define CHALLENGE_LEN 20 int Client::_clientIdCounter = 0; - +/******************************************************************************/ Client::Client(QSslSocket* socket) : _socket(socket), _authed(0), _timerDelete(0), _desiredProjectionSource(0), _isProjectionSource(false), _currentProjectionSource(0), _vncPort(0), _activeVncClient(false), _isTutor(false) @@ -49,6 +49,7 @@ Client::Client(QSslSocket* socket) : _pingTimeout = QDateTime::currentMSecsSinceEpoch() + PING_TIMEOUT_MS; } +/******************************************************************************/ Client::~Client() { if (_socket != NULL) @@ -59,6 +60,7 @@ Client::~Client() qDebug("*** Client %s destroyed.", qPrintable(_ip)); } +/******************************************************************************/ void Client::timerEvent(QTimerEvent* event) { if (event->timerId() == _timerPingTimeout) @@ -95,6 +97,7 @@ void Client::timerEvent(QTimerEvent* event) killTimer(event->timerId()); } +/******************************************************************************/ void Client::sendMessage(NetworkMessage& message) { if (_socket == NULL || _socket->state() != QAbstractSocket::ConnectedState) @@ -106,6 +109,7 @@ void Client::sendMessage(NetworkMessage& message) } } +/******************************************************************************/ void Client::requestThumb(const int width, const int height) { if (_socket == NULL || _socket->state() != QAbstractSocket::ConnectedState) @@ -120,6 +124,7 @@ void Client::requestThumb(const int width, const int height) _toClient.writeMessage(_socket); } +/******************************************************************************/ void Client::onDataArrival() { // @@ -149,6 +154,7 @@ void Client::onDataArrival() } } +/******************************************************************************/ void Client::handleMsg() { _pingTimeout = QDateTime::currentMSecsSinceEpoch() + PING_TIMEOUT_MS; @@ -288,6 +294,7 @@ void Client::handleMsg() } +/******************************************************************************/ void Client::startVncServer() { _vncPort = 0; @@ -297,6 +304,7 @@ void Client::startVncServer() sendMessage(_toClient); } +/******************************************************************************/ void Client::stopVncServer() { _toClient.reset(); @@ -305,6 +313,7 @@ void Client::stopVncServer() sendMessage(_toClient); } +/******************************************************************************/ void Client::stopVncClient() { _activeVncClient = false; @@ -313,6 +322,7 @@ void Client::stopVncClient() sendMessage(_toClient); } +/******************************************************************************/ void Client::setTutor(bool enable) { _toClient.reset(); @@ -322,6 +332,7 @@ void Client::setTutor(bool enable) _isTutor = enable; } +/******************************************************************************/ void Client::disconnect() { if (_timerDelete == 0) diff --git a/src/server/net/client.h b/src/server/net/client.h index 2de631d..7bcdc2d 100644 --- a/src/server/net/client.h +++ b/src/server/net/client.h @@ -4,6 +4,7 @@ #include <QtCore> #include <QSslError> #include <QAbstractSocket> +#include <QSslSocket> #include "../../shared/networkmessage.h" class QSslSocket; |