From 5e890f9c07e5522703409e78f5f0b5b962f2073b Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Mon, 26 Sep 2016 05:25:18 +0000 Subject: [PATCH] fix aforementioned bugs/mistakes/typos probably need to add the SOE logging class to this one, or give it a log output location or something at some point --- .../server/application/LoginServer/src/shared/LoginServer.cpp | 4 ++-- engine/shared/library/sharedNetwork/src/shared/Service.cpp | 4 ++-- external/3rd/library/udplibrary/UdpLibrary.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/server/application/LoginServer/src/shared/LoginServer.cpp b/engine/server/application/LoginServer/src/shared/LoginServer.cpp index 3c91104d..75ddf13b 100755 --- a/engine/server/application/LoginServer/src/shared/LoginServer.cpp +++ b/engine/server/application/LoginServer/src/shared/LoginServer.cpp @@ -147,11 +147,11 @@ LoginServer::LoginServer() : setup.compress = ConfigLoginServer::getCompressClientNetworkTraffic(); setup.useTcp = false; - clientService = new Service(ConnectionAllocator(), setup, ConfigLoginServer::getMaxConnectionsPerIP()); + clientService = new Service(ConnectionAllocator(), setup); setup.compress = false; setup.port = ConfigLoginServer::getPingServicePort(); - pingService = new Service(ConnectionAllocator(), setup, ConfigLoginServer::getMaxConnectionsPerIP()); + pingService = new Service(ConnectionAllocator(), setup); setup.useTcp = true; if (ConfigLoginServer::getDevelopmentMode()) diff --git a/engine/shared/library/sharedNetwork/src/shared/Service.cpp b/engine/shared/library/sharedNetwork/src/shared/Service.cpp index ef9a1792..c3967278 100755 --- a/engine/shared/library/sharedNetwork/src/shared/Service.cpp +++ b/engine/shared/library/sharedNetwork/src/shared/Service.cpp @@ -92,7 +92,7 @@ m_tcpServer(0) p.icmpErrorRetryPeriod = setup.icmpErrorRetryPeriod; p.maxDataHoldSize = setup.maxDataHoldSize; p.allowPortRemapping = setup.allowPortRemapping; - p.maxConnectionsPerIP = setup.maxconnectionsPerIP; + p.maxConnectionsPerIP = setup.maxConnectionsPerIP; if (realAddress.length() > 0) { @@ -165,7 +165,7 @@ m_tcpServer(0) m_maxConnections = setup.maxConnections; newService(this); - `->connect(*this, &Service::onConnectionClosed); + m_callback->connect(*this, &Service::onConnectionClosed); } //----------------------------------------------------------------------- diff --git a/external/3rd/library/udplibrary/UdpLibrary.cpp b/external/3rd/library/udplibrary/UdpLibrary.cpp index a2db25af..630e32a3 100755 --- a/external/3rd/library/udplibrary/UdpLibrary.cpp +++ b/external/3rd/library/udplibrary/UdpLibrary.cpp @@ -1014,7 +1014,7 @@ void UdpManager::ProcessRawPacket(const PacketHistoryEntry *e) if (clientConnections >= mParams.maxConnectionsPerIP) { - printf("Possible DoS attempt? Client %i attempted more connections than the limit (%i). Dropping!", e->mIp, mParams.maxConnectionsPerIP); + printf("Possible DoS attempt? Client %i attempted more connections than the limit (%i). Dropping!\n", e->mIp.GetAddress(), mParams.maxConnectionsPerIP); return; } }