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/discoverylistener.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/discoverylistener.cpp')
| -rw-r--r-- | src/server/net/discoverylistener.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/net/discoverylistener.cpp b/src/server/net/discoverylistener.cpp index 8eb1091..e8d286d 100644 --- a/src/server/net/discoverylistener.cpp +++ b/src/server/net/discoverylistener.cpp @@ -7,7 +7,7 @@ #include "discoverylistener.h" #include "certmanager.h" -#include "../util/global.h" +#include "../serverapp/serverapp.h" #include "../../shared/settings.h" #include "../../shared/network.h" #include "../../shared/util.h" @@ -150,8 +150,8 @@ void DiscoveryListener::onReadyRead() if (!Network::isAddressInList(QString::fromUtf8(iplist), addr.toString())) continue; // If so, check if the submitted hash seems valid - if (genSha1(&Global::sessionNameArray(), &salt1, &iplist) != hash && - !(Global::getCurrentRoom()->clientPositions.contains(addr.toString()))) { + if (genSha1(&serverApp->sessionNameArray(), &salt1, &iplist) != hash && + !(serverApp->getCurrentRoom()->clientPositions.contains(addr.toString()))) { // did not match local session name and client is not in same room. continue; } @@ -164,7 +164,7 @@ void DiscoveryListener::onReadyRead() QByteArray certhash(cert.digest(QCryptographicHash::Sha1)); // Reply to client _packet.reset(); - _packet.setField(_HASH, genSha1(&Global::sessionNameArray(), &salt2, &myiplist, &CLIENT_PORT_ARRAY, &certhash)); + _packet.setField(_HASH, genSha1(&serverApp->sessionNameArray(), &salt2, &myiplist, &CLIENT_PORT_ARRAY, &certhash)); _packet.setField(_IPLIST, myiplist); _packet.setField(_PORT, CLIENT_PORT_ARRAY); _packet.setField(_CERT, certhash); |