From bc5ec9fa9d413c1176bb7633dd97de3a0cf3eaaf Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Wed, 25 Aug 2021 03:29:16 +0200
Subject: [PATCH] Add hwid to logconnectionattempt

---
 core/include/aoclient.h        | 9 +++++++++
 core/include/logger/u_logger.h | 2 +-
 core/include/server.h          | 2 +-
 core/src/aoclient.cpp          | 2 ++
 core/src/logger/u_logger.cpp   | 4 ++--
 core/src/packets.cpp           | 1 +
 core/src/server.cpp            | 1 -
 7 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/core/include/aoclient.h b/core/include/aoclient.h
index b7cbfcf..e0e4170 100644
--- a/core/include/aoclient.h
+++ b/core/include/aoclient.h
@@ -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.
      */
diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h
index ce35c3e..29e920a 100644
--- a/core/include/logger/u_logger.h
+++ b/core/include/logger/u_logger.h
@@ -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:
 
diff --git a/core/include/server.h b/core/include/server.h
index 52d6690..dfb9c27 100644
--- a/core/include/server.h
+++ b/core/include/server.h
@@ -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:
     /**
diff --git a/core/src/aoclient.cpp b/core/src/aoclient.cpp
index 012f520..3cab625 100644
--- a/core/src/aoclient.cpp
+++ b/core/src/aoclient.cpp
@@ -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()
diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp
index 5f95009..7499d22 100644
--- a/core/src/logger/u_logger.cpp
+++ b/core/src/logger/u_logger.cpp
@@ -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);
 }
 
diff --git a/core/src/packets.cpp b/core/src/packets.cpp
index 8846040..1af070e 100644
--- a/core/src/packets.cpp
+++ b/core/src/packets.cpp
@@ -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)
diff --git a/core/src/server.cpp b/core/src/server.cpp
index dc6b0d3..f740f10 100644
--- a/core/src/server.cpp
+++ b/core/src/server.cpp
@@ -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