diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-06-02 18:38:41 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-06-02 18:38:41 +0200 |
| commit | 74d9da7f3257c510b4f99fca635c5a9971053300 (patch) | |
| tree | 7a12179eb0b716e82ff755e1f0e90594070f2a4e /src/server/shared/Networking | |
| parent | 2d984fcade155bf860ed20713a95251ad0103318 (diff) | |
Core/Network: Make ip address formattable with fmt
Diffstat (limited to 'src/server/shared/Networking')
| -rw-r--r-- | src/server/shared/Networking/ConnectionInitializers/IpBanCheckConnectionInitializer.cpp | 4 | ||||
| -rw-r--r-- | src/server/shared/Networking/ConnectionInitializers/IpBanCheckConnectionInitializer.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/server/shared/Networking/ConnectionInitializers/IpBanCheckConnectionInitializer.cpp b/src/server/shared/Networking/ConnectionInitializers/IpBanCheckConnectionInitializer.cpp index 5996c40faee..4e7d9a4ab72 100644 --- a/src/server/shared/Networking/ConnectionInitializers/IpBanCheckConnectionInitializer.cpp +++ b/src/server/shared/Networking/ConnectionInitializers/IpBanCheckConnectionInitializer.cpp @@ -18,10 +18,10 @@ #include "IpBanCheckConnectionInitializer.h" #include "DatabaseEnv.h" -QueryCallback Trinity::Net::IpBanCheckHelpers::AsyncQuery(std::string_view ipAddress) +QueryCallback Trinity::Net::IpBanCheckHelpers::AsyncQuery(boost::asio::ip::address const& ipAddress) { LoginDatabasePreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_IP_INFO); - stmt->setString(0, ipAddress); + stmt->setString(0, ipAddress.to_string()); return LoginDatabase.AsyncQuery(stmt); } diff --git a/src/server/shared/Networking/ConnectionInitializers/IpBanCheckConnectionInitializer.h b/src/server/shared/Networking/ConnectionInitializers/IpBanCheckConnectionInitializer.h index 84df525918e..d8badeb1203 100644 --- a/src/server/shared/Networking/ConnectionInitializers/IpBanCheckConnectionInitializer.h +++ b/src/server/shared/Networking/ConnectionInitializers/IpBanCheckConnectionInitializer.h @@ -19,6 +19,7 @@ #define TRINITYCORE_IP_BAN_CHECK_CONNECTION_INITIALIZER_H #include "DatabaseEnvFwd.h" +#include "IpAddress.h" #include "Log.h" #include "QueryCallback.h" #include "SocketConnectionInitializer.h" @@ -27,7 +28,7 @@ namespace Trinity::Net { namespace IpBanCheckHelpers { -TC_SHARED_API QueryCallback AsyncQuery(std::string_view ipAddress); +TC_SHARED_API QueryCallback AsyncQuery(boost::asio::ip::address const& ipAddress); TC_SHARED_API bool IsBanned(PreparedQueryResult const& result); } @@ -38,7 +39,7 @@ struct IpBanCheckConnectionInitializer final : SocketConnectionInitializer void Start() override { - _socket->QueueQuery(IpBanCheckHelpers::AsyncQuery(_socket->GetRemoteIpAddress().to_string()).WithPreparedCallback([socketRef = _socket->weak_from_this(), self = this->shared_from_this()](PreparedQueryResult const& result) + _socket->QueueQuery(IpBanCheckHelpers::AsyncQuery(_socket->GetRemoteIpAddress()).WithPreparedCallback([socketRef = _socket->weak_from_this(), self = this->shared_from_this()](PreparedQueryResult const& result) { std::shared_ptr<SocketImpl> socket = static_pointer_cast<SocketImpl>(socketRef.lock()); if (!socket) @@ -46,7 +47,7 @@ struct IpBanCheckConnectionInitializer final : SocketConnectionInitializer if (IpBanCheckHelpers::IsBanned(result)) { - TC_LOG_ERROR("network", "IpBanCheckConnectionInitializer: IP {} is banned.", socket->GetRemoteIpAddress().to_string()); + TC_LOG_ERROR("network", "IpBanCheckConnectionInitializer: IP {} is banned.", socket->GetRemoteIpAddress()); socket->CloseSocket(); return; } |
