Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add hwid to logconnectionattempt

Browse Source
This commit is contained in:
Salanto 2021-08-25 03:29:16 +02:00
parent 16fd57e591
commit bc5ec9fa9d
7 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/include/aoclient.h
View File

@ -75,6 +75,15 @@ class AOClient : public QObject {
*/
QString getIpid() const;
/**
* @brief Getter for the client's HWID.
*
* @return The HWID.
*
* @see #hwid
*/
QString getHwid() const;
/**
* @brief Calculates the client's IPID based on a hashed version of its IP.
*/

2
core/include/logger/u_logger.h
View File

@ -90,7 +90,7 @@ public slots:
/**
* @brief Logs any connection attempt to the server, wether sucessful or not.
*/
void logConnectionAttempt(const QString &f_ip_address, const QString &f_ipid);
void logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid, const QString& f_hwid);
private:

2
core/include/server.h
View File

@ -284,7 +284,7 @@ class Server : public QObject {
* @param f_ipid The IPID of the incoming connection.
* @param f_hdid The HDID of the incoming connection.
*/
void logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid);
void logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid, const QString& f_hwid);
private:
/**

2
core/src/aoclient.cpp
View File

@ -342,6 +342,8 @@ bool AOClient::checkAuth(unsigned long long acl_mask)
QString AOClient::getIpid() const { return ipid; }
QString AOClient::getHwid() const { return hwid; }
Server* AOClient::getServer() { return server; }
void AOClient::onAfkTimeout()

4
core/src/logger/u_logger.cpp
View File

@ -131,11 +131,11 @@ void ULogger::logModcall(const QString &f_charName, const QString &f_ipid, const
}
}
void ULogger::logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid)
void ULogger::logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid, const QString& f_hwid)
{
QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss");
QString l_logEntry = QStringLiteral("[%1][CONNECT][%2][%3]\n")
.arg(l_time, f_ip_address, f_ipid);
.arg(l_time, f_ip_address, f_ipid, f_hwid);
updateAreaBuffer("SERVER",l_logEntry);
}

1
core/src/packets.cpp
View File

@ -43,6 +43,7 @@ void AOClient::pktHardwareId(AreaData* area, int argc, QStringList argv, AOPacke
return;
}
sendPacket("ID", {QString::number(id), "akashi", QCoreApplication::applicationVersion()});
emit server->logConnectionAttempt(remote_ip.toString(), ipid, hwid);
}
void AOClient::pktSoftwareId(AreaData* area, int argc, QStringList argv, AOPacket packet)

1
core/src/server.cpp
View File

@ -174,7 +174,6 @@ void Server::clientConnected()
// completely in any client 2.4.3 or newer
client->sendPacket(decryptor);
hookupLogger(client);
emit logConnectionAttempt(client->remote_ip.toString(), client->getIpid());
#ifdef NET_DEBUG
qDebug() << client->remote_ip.toString() << "connected";
#endif