aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Privatized Function

Browse source 
Moved the updated hashing function out of the settingscache and into the
remoteclient and privatized the function for proper use.
This commit is contained in:
woogerboy21 2016-03-29 22:00:42 -04:00
parent ee849f6379
commit 506ad91b03
4 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cockatrice/src/remoteclient.cpp
View file

@ -1,6 +1,7 @@
#include <QList> #include <QList>
#include <QTimer> #include <QTimer>
#include <QThread> #include <QThread>
#include <QCryptographicHash>
#include "remoteclient.h" #include "remoteclient.h"
#include "settingscache.h" #include "settingscache.h"
#include "pending_command.h" #include "pending_command.h"
@ -81,7 +82,7 @@ void RemoteClient::processServerIdentificationEvent(const Event_ServerIdentifica
cmdRegister.set_gender((ServerInfo_User_Gender) gender); cmdRegister.set_gender((ServerInfo_User_Gender) gender);
cmdRegister.set_country(country.toStdString()); cmdRegister.set_country(country.toStdString());
cmdRegister.set_real_name(realName.toStdString()); cmdRegister.set_real_name(realName.toStdString());
cmdRegister.set_clientid(settingsCache->getSrvClientID(lastHostname).toStdString()); cmdRegister.set_clientid(getSrvClientID(lastHostname).toStdString());
PendingCommand *pend = prepareSessionCommand(cmdRegister); PendingCommand *pend = prepareSessionCommand(cmdRegister);
connect(pend, SIGNAL(finished(Response, CommandContainer, QVariant)), this, SLOT(registerResponse(Response))); connect(pend, SIGNAL(finished(Response, CommandContainer, QVariant)), this, SLOT(registerResponse(Response)));
sendCommand(pend); sendCommand(pend);
@ -107,11 +108,10 @@ void RemoteClient::processServerIdentificationEvent(const Event_ServerIdentifica
void RemoteClient::doLogin() { void RemoteClient::doLogin() {
setStatus(StatusLoggingIn); setStatus(StatusLoggingIn);
Command_Login cmdLogin; Command_Login cmdLogin;
cmdLogin.set_user_name(userName.toStdString()); cmdLogin.set_user_name(userName.toStdString());
cmdLogin.set_password(password.toStdString()); cmdLogin.set_password(password.toStdString());
cmdLogin.set_clientid(settingsCache->getSrvClientID(lastHostname).toStdString()); cmdLogin.set_clientid(getSrvClientID(lastHostname).toStdString());
cmdLogin.set_clientver(VERSION_STRING); cmdLogin.set_clientver(VERSION_STRING);
if (!clientFeatures.isEmpty()) { if (!clientFeatures.isEmpty()) {
@ -361,3 +361,11 @@ void RemoteClient::disconnectFromServer()
{ {
emit sigDisconnectFromServer(); emit sigDisconnectFromServer();
} }
QString RemoteClient::getSrvClientID(const QString _hostname)
{
QString srvClientID = settingsCache->getClientID();
srvClientID += _hostname;
QString uniqueServerClientID = QCryptographicHash::hash(srvClientID.toUtf8(), QCryptographicHash::Sha1).toHex().right(15);
return uniqueServerClientID;
}

1
cockatrice/src/remoteclient.h
View file

@ -51,6 +51,7 @@ private:
QTcpSocket *socket; QTcpSocket *socket;
QString lastHostname; QString lastHostname;
int lastPort; int lastPort;
QString getSrvClientID(const QString _hostname);
protected slots: protected slots:
void sendCommandContainer(const CommandContainer &cont); void sendCommandContainer(const CommandContainer &cont);
public: public:

9
cockatrice/src/settingscache.cpp
View file

@ -2,7 +2,6 @@
#include <QSettings> #include <QSettings>
#include <QFile> #include <QFile>
#include <QApplication> #include <QApplication>
#include <QCryptographicHash>
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
#include <QStandardPaths> #include <QStandardPaths>
@ -613,12 +612,4 @@ void SettingsCache::setNotifyAboutUpdate(int _notifyaboutupdate)
{ {
notifyAboutUpdates = _notifyaboutupdate; notifyAboutUpdates = _notifyaboutupdate;
settings->setValue("personal/updatenotification", notifyAboutUpdates); settings->setValue("personal/updatenotification", notifyAboutUpdates);
}
QString SettingsCache::getSrvClientID(const QString _hostname)
{
QString srvClientID = getClientID();
srvClientID += _hostname;
QString uniqueServerClientID = QCryptographicHash::hash(srvClientID.toUtf8(), QCryptographicHash::Sha1).toHex().right(15);
return uniqueServerClientID;
} }

3
cockatrice/src/settingscache.h
View file

@ -176,8 +176,7 @@ public:
bool getRememberGameSettings() const { return rememberGameSettings; } bool getRememberGameSettings() const { return rememberGameSettings; }
int getKeepAlive() const { return keepalive; } int getKeepAlive() const { return keepalive; }
void setClientID(QString clientID); void setClientID(QString clientID);
QString getClientID() { return clientID; } QString getClientID() { return clientID; }
QString getSrvClientID(const QString _hostname);
ShortcutsSettings& shortcuts() const { return *shortcutsSettings; } ShortcutsSettings& shortcuts() const { return *shortcutsSettings; }
CardDatabaseSettings& cardDatabase() const { return *cardDatabaseSettings; } CardDatabaseSettings& cardDatabase() const { return *cardDatabaseSettings; }
ServersSettings& servers() const { return *serversSettings; } ServersSettings& servers() const { return *serversSettings; }