Merge pull request #776 from openmultiplayer/hual/757

Synchronize bans so multiple players are banned at once
openmultiplayer · Nov 24, 2023 · bb83a9f · bb83a9f
2 parents 8829f9f + 111fb9f
commit bb83a9f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/Server/Components/LegacyNetwork/legacy_network_impl.cpp b/Server/Components/LegacyNetwork/legacy_network_impl.cpp
@@ -586,12 +586,35 @@ void RakNetLegacyNetwork::RPCHook(RakNet::RPCParameters* rpcParams, void* extra)
 #endif
 }
 
+void RakNetLegacyNetwork::synchronizeBans()
+{
+	char addr[22] = { 0 };
+	unsigned short port;
+	for (IPlayer* player : core->getPlayers().entries())
+	{
+		const PeerNetworkData& netData = player->getNetworkData();
+		if (netData.network != this)
+		{
+			continue;
+		}
+
+		const PeerNetworkData::NetworkID& nid = netData.networkID;
+		const RakNet::PlayerID rid { unsigned(nid.address.v4), nid.port };
+		rakNetServer.GetPlayerIPFromID(rid, addr, &port);
+		if (rakNetServer.IsBanned(addr))
+		{
+			player->kick();
+		}
+	}
+}
+
 void RakNetLegacyNetwork::ban(const BanEntry& entry, Milliseconds expire)
 {
 	// Only support ipv4
 	if (entry.address != StringView("127.0.0.1"))
 	{
 		rakNetServer.AddToBanList(entry.address.data(), expire.count());
+		synchronizeBans();
 	}
 }
 

diff --git a/Server/Components/LegacyNetwork/legacy_network_impl.hpp b/Server/Components/LegacyNetwork/legacy_network_impl.hpp
@@ -357,6 +357,9 @@ class RakNetLegacyNetwork final : public Network, public CoreEventHandler, publi
 
 	void handlePreConnectPacketData(int playerIndex);
 
+	/// Synchronize players after banning an IP, kicking any that match the banned IP
+	void synchronizeBans();
+
 	NetworkStats getStatistics(IPlayer* player = nullptr) override;
 
 	unsigned getPing(const IPlayer& peer) override