diff options
Diffstat (limited to 'src/server/net')
| -rw-r--r-- | src/server/net/certmanager.cpp | 3 | ||||
| -rw-r--r-- | src/server/net/client.cpp | 8 | ||||
| -rw-r--r-- | src/server/net/discoverylistener.cpp | 8 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/server/net/certmanager.cpp b/src/server/net/certmanager.cpp index e91fed3..933bbbc 100644 --- a/src/server/net/certmanager.cpp +++ b/src/server/net/certmanager.cpp @@ -15,8 +15,9 @@ # ----------------------------------------------------------------------------- */ +#define CERTSTORAGE ".config/openslx/pvs2/" + #include "certmanager.h" -#include "../util/util.h" #include <QMap> #include <QDir> #include <QDebug> 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"); 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); |