diff options
| author | Björn Hagemeister | 2014-06-02 15:27:23 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-06-02 15:27:23 +0200 |
| commit | 4778d18cc1287e9a3fd2c3a7eec5f90e685c3f62 (patch) | |
| tree | c798ea39460f49f6f6e34f7f909470923bf68e5f /src/server/net/client.cpp | |
| parent | Put Check if manager is running on machine into method. (diff) | |
| parent | Uncheck lock if any action is performed. (diff) | |
| download | pvs2-4778d18cc1287e9a3fd2c3a7eec5f90e685c3f62.tar.gz pvs2-4778d18cc1287e9a3fd2c3a7eec5f90e685c3f62.tar.xz pvs2-4778d18cc1287e9a3fd2c3a7eec5f90e685c3f62.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Conflicts:
src/server/mainwindow/mainwindow.h
Diffstat (limited to 'src/server/net/client.cpp')
| -rw-r--r-- | src/server/net/client.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp index abd739d..135157c 100644 --- a/src/server/net/client.cpp +++ b/src/server/net/client.cpp @@ -46,8 +46,8 @@ Client::Client(QSslSocket* socket) : _socket(socket) msgChlng.setField(_CHALLENGE, _challenge); msgChlng.writeMessage(_socket); // give client 3 seconds to complete handshake - _timerIdAuthTimeout = startTimer(3000); - _timerPingTimeout = startTimer(600000); // for debugging purposes 10min + _timerIdAuthTimeout = startTimer(600000);// TODO undo, for debugging purposes 10min + _timerPingTimeout = startTimer(600000); // TODO undo, for debugging purposes 10min _pingTimeout = QDateTime::currentMSecsSinceEpoch() + PING_TIMEOUT_MS; } @@ -169,7 +169,6 @@ void Client::handleMsg() if (_vncPort <= 0) { qDebug() << "Starting VNC server on client" << _name << " (" << _socket->peerAddress().toString()+_vncPort << ") failed."; - // TODO: Show message on manager } else { |