handle internal immediate forced disconnects

openmultiplayer · Apr 1, 2024 · fcdc806 · fcdc806
1 parent 2b6eb99
commit fcdc806
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Server/Components/LegacyNetwork/legacy_network_impl.cpp b/Server/Components/LegacyNetwork/legacy_network_impl.cpp
@@ -529,6 +529,12 @@ void RakNetLegacyNetwork::OnRakNetDisconnect(RakNet::PlayerIndex rid, PeerDiscon
 	networkEventDispatcher.dispatch(&NetworkEventHandler::onPeerDisconnect, *player, reason);
 }
 
+void RakNetLegacyNetwork::OnCloseConnection(RakNet::RakPeerInterface* peer, RakNet::PlayerID playerId)
+{
+	auto playerIndex = peer->GetIndexFromPlayerID(playerId);
+	OnRakNetDisconnect(playerIndex, PeerDisconnectReason_Kicked);
+}
+
 template <size_t ID>
 void RakNetLegacyNetwork::RPCHook(RakNet::RPCParameters* rpcParams, void* extra)
 {
@@ -870,6 +876,8 @@ void RakNetLegacyNetwork::start()
 			const String get = "https://api.open.mp/0.3.7/announce/" + std::to_string(port);
 			core->requestHTTP4(new AnnounceHTTPResponseHandler(core), HTTPRequestType::HTTPRequestType_Get, get.data());
 		}
+
+		rakNetServer.AttachPlugin(this);
 	}
 
 	rakNetServer.StartOccasionalPing();

diff --git a/Server/Components/LegacyNetwork/legacy_network_impl.hpp b/Server/Components/LegacyNetwork/legacy_network_impl.hpp
@@ -19,6 +19,7 @@
 #include <raknet/GetTime.h>
 #include <raknet/RakNetworkFactory.h>
 #include <raknet/RakServerInterface.h>
+#include <raknet/PluginInterface.h>
 #include <raknet/StringCompressor.h>
 
 using namespace Impl;
@@ -31,7 +32,7 @@ static const StaticArray<StringView, 2> ProtectedRules = {
 
 class Core;
 
-class RakNetLegacyNetwork final : public Network, public CoreEventHandler, public PlayerConnectEventHandler, public PlayerChangeEventHandler, public INetworkQueryExtension
+class RakNetLegacyNetwork final : public Network, public CoreEventHandler, public PlayerConnectEventHandler, public PlayerChangeEventHandler, public INetworkQueryExtension, public RakNet::PluginInterface
 {
 private:
 	ICore* core = nullptr;
@@ -290,6 +291,7 @@ class RakNetLegacyNetwork final : public Network, public CoreEventHandler, publi
 	void start();
 
 	void OnRakNetDisconnect(RakNet::PlayerIndex rid, PeerDisconnectReason reason);
+	void OnCloseConnection(RakNet::RakPeerInterface* peer, RakNet::PlayerID playerId) override;
 
 	void onPlayerScoreChange(IPlayer& player, int score) override
 	{