OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

if a viewer overloads region capability to process RequestMapBlocks, ignore following requests for 300 seconds. This was necessary becaus some viewers like FireStorm are doing it, saturating region and grid services for no usefull reason

LSLKeyTest
UbitUmarov 2016-08-06 22:12:38 +01:00
parent f7419ad52d
commit 83d6722d31
1 changed files with 64 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@ -1060,13 +1060,62 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
/// <param name="maxY"></param> /// <param name="maxY"></param>
public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
{ {
m_log.DebugFormat("[WoldMapModule] RequestMapBlocks {0}={1}={2}={3} {4}", minX, minY, maxX, maxY, flag); // m_log.DebugFormat("[WoldMapModule] RequestMapBlocks {0}={1}={2}={3} {4}", minX, minY, maxX, maxY, flag);
GetAndSendBlocks(remoteClient, minX, minY, maxX, maxY, flag); GetAndSendBlocks(remoteClient, minX, minY, maxX, maxY, flag);
} }
private const double SPAMBLOCKTIMEms = 300000; // 5 minutes
private Dictionary<UUID,double> spamBlocked = new Dictionary<UUID,double>();
protected virtual List<MapBlockData> GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) protected virtual List<MapBlockData> GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
{ {
// anti spam because of FireStorm 4.7.7 absurd request repeat rates
// possible others
double now = Util.GetTimeStampMS();
UUID agentID = remoteClient.AgentId;
lock (m_mapBlockRequestEvent)
{
if(spamBlocked.ContainsKey(agentID))
{
if(spamBlocked[agentID] < now &&
(!m_mapBlockRequests.ContainsKey(agentID) ||
m_mapBlockRequests[agentID].Count == 0 ))
{
spamBlocked.Remove(agentID);
m_log.DebugFormat("[WoldMapModule] RequestMapBlocks release spammer {0}", agentID);
}
else
return new List<MapBlockData>();
}
else
{
// ugly slow expire spammers
if(spamBlocked.Count > 0)
{
UUID k = UUID.Zero;
bool expireone = false;
foreach(UUID k2 in spamBlocked.Keys)
{
if(spamBlocked[k2] < now &&
(!m_mapBlockRequests.ContainsKey(k2) ||
m_mapBlockRequests[k2].Count == 0 ))
{
m_log.DebugFormat("[WoldMapModule] RequestMapBlocks release spammer {0}", k2);
k = k2;
expireone = true;
}
break; // doing one at a time
}
if(expireone)
spamBlocked.Remove(k);
}
}
// m_log.DebugFormat("[WoldMapModule] RequestMapBlocks {0}={1}={2}={3} {4}", minX, minY, maxX, maxY, flag);
MapBlockRequestData req = new MapBlockRequestData(); MapBlockRequestData req = new MapBlockRequestData();
req.client = remoteClient; req.client = remoteClient;
@ -1076,11 +1125,15 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
req.maxY = maxY; req.maxY = maxY;
req.flags = flag; req.flags = flag;
lock (m_mapBlockRequestEvent) if (!m_mapBlockRequests.ContainsKey(agentID))
m_mapBlockRequests[agentID] = new Queue<MapBlockRequestData>();
if(m_mapBlockRequests[agentID].Count < 150 )
m_mapBlockRequests[agentID].Enqueue(req);
else
{ {
if (!m_mapBlockRequests.ContainsKey(remoteClient.AgentId)) spamBlocked[agentID] = now + SPAMBLOCKTIMEms;
m_mapBlockRequests[remoteClient.AgentId] = new Queue<MapBlockRequestData>(); m_log.DebugFormat("[WoldMapModule] RequestMapBlocks blocking spammer {0} for {1} s",agentID, SPAMBLOCKTIMEms/1000.0);
m_mapBlockRequests[remoteClient.AgentId].Enqueue(req); }
m_mapBlockRequestEvent.Set(); m_mapBlockRequestEvent.Set();
} }