diff options
| author | Christian Klinger | 2016-09-30 12:02:38 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-09-30 12:02:38 +0200 |
| commit | 877607b07f30cbb8d7d8d06b1b91383095fdc144 (patch) | |
| tree | 4c2ca41db4b9caa8e6c370237771d58bd99d7f13 /src/server/net/client.cpp | |
| parent | added a pre-commit hook for astyle. (diff) | |
| download | pvs2-877607b07f30cbb8d7d8d06b1b91383095fdc144.tar.gz pvs2-877607b07f30cbb8d7d8d06b1b91383095fdc144.tar.xz pvs2-877607b07f30cbb8d7d8d06b1b91383095fdc144.zip | |
refactoring.
Diffstat (limited to 'src/server/net/client.cpp')
| -rw-r--r-- | src/server/net/client.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp index 5cd5c30..59211b7 100644 --- a/src/server/net/client.cpp +++ b/src/server/net/client.cpp @@ -6,7 +6,7 @@ */ #include "client.h" -#include "../util/global.h" +#include "../serverapp/serverapp.h" #include "../../shared/settings.h" #include "../../shared/util.h" #include <QPixmap> @@ -227,8 +227,8 @@ void Client::handleMsg() if (id == _CHALLENGE) { QByteArray hash(_fromClient.getFieldBytes(_HASH)); QByteArray challenge(_fromClient.getFieldBytes(_CHALLENGE)); - if (genSha1(&Global::sessionNameArray(), &_challenge) != hash - && !(Global::getCurrentRoom()->clientPositions.contains(_socket->peerAddress().toString()))) { + if (genSha1(&serverApp->sessionNameArray(), &_challenge) != hash + && !(serverApp->getCurrentRoom()->clientPositions.contains(_socket->peerAddress().toString()))) { // Challenge reply is invalid, drop client NetworkMessage msgErr; msgErr.buildErrorMessage("Challenge reply invalid."); @@ -239,7 +239,7 @@ void Client::handleMsg() // Now answer to challenge by client NetworkMessage msgChlng; msgChlng.setField(_ID, _CHALLENGE); - msgChlng.setField(_HASH, genSha1(&Global::sessionNameArray(), &challenge)); + msgChlng.setField(_HASH, genSha1(&serverApp->sessionNameArray(), &challenge)); msgChlng.writeMessage(_socket); _authed = 1; qDebug("client's challenge reply was valid, step <- 1"); |