diff options
| author | Christian Klinger | 2016-04-27 12:24:37 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-04-27 12:24:37 +0200 |
| commit | f193e6f2e2385a9e240db18d2fda07aae42e1d2a (patch) | |
| tree | 6273c5979fdb434b66d12d49df51830f7bbbef6d /src/server/net | |
| parent | basic resizing works. (diff) | |
| download | pvs2-f193e6f2e2385a9e240db18d2fda07aae42e1d2a.tar.gz pvs2-f193e6f2e2385a9e240db18d2fda07aae42e1d2a.tar.xz pvs2-f193e6f2e2385a9e240db18d2fda07aae42e1d2a.zip | |
refactor to use Room struct
to save additional properties like gridSize and clientSize.
Diffstat (limited to 'src/server/net')
| -rw-r--r-- | src/server/net/client.cpp | 2 | ||||
| -rw-r--r-- | src/server/net/discoverylistener.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp index 029b88a..8a10cd8 100644 --- a/src/server/net/client.cpp +++ b/src/server/net/client.cpp @@ -255,7 +255,7 @@ void Client::handleMsg() QByteArray hash(_fromClient.getFieldBytes(_HASH)); QByteArray challenge(_fromClient.getFieldBytes(_CHALLENGE)); if (genSha1(&Global::sessionNameArray(), &_challenge) != hash - && !(Global::getRooms()[Global::getCurrentRoom()].contains(_socket->peerAddress().toString()))) + && !(Global::getRooms()[Global::getCurrentRoom()]->clientPositions.contains(_socket->peerAddress().toString()))) { // Challenge reply is invalid, drop client NetworkMessage msgErr; msgErr.buildErrorMessage("Challenge reply invalid."); diff --git a/src/server/net/discoverylistener.cpp b/src/server/net/discoverylistener.cpp index 58e877c..b532688 100644 --- a/src/server/net/discoverylistener.cpp +++ b/src/server/net/discoverylistener.cpp @@ -160,7 +160,7 @@ void DiscoveryListener::onReadyRead() continue; // If so, check if the submitted hash seems valid if (genSha1(&Global::sessionNameArray(), &salt1, &iplist) != hash && - !(Global::getRooms()[Global::getCurrentRoom()].contains(addr.toString()))) + !(Global::getRooms()[Global::getCurrentRoom()]->clientPositions.contains(addr.toString()))) { // did not match local session name and client is not in same room. continue; |