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

Add stat clientstack.<scene>.IncomingPacketsOrphanedCount to record well-formed packets that were not initial connection packets and could not be associated with a connected viewer.

0.7.6-extended
Justin Clark-Casey (justincc) 2013-08-14 22:33:12 +01:00
parent 0d5680e971
commit 93dffe1777
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@ -119,6 +119,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
stat => stat.Value = m_udpServer.IncomingMalformedPacketCount, stat => stat.Value = m_udpServer.IncomingMalformedPacketCount,
StatVerbosity.Info)); StatVerbosity.Info));
StatsManager.RegisterStat(
new Stat(
"IncomingPacketsOrphanedCount",
"Number of inbound packets that were not initial connections packets and could not be associated with a viewer.",
"",
"",
"clientstack",
scene.Name,
StatType.Pull,
MeasuresOfInterest.AverageChangeOverTime,
stat => stat.Value = m_udpServer.IncomingOrphanedPacketCount,
StatVerbosity.Info));
StatsManager.RegisterStat( StatsManager.RegisterStat(
new Stat( new Stat(
"OutgoingUDPSendsCount", "OutgoingUDPSendsCount",
@ -286,6 +299,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// </summary> /// </summary>
public int IncomingMalformedPacketCount { get; private set; } public int IncomingMalformedPacketCount { get; private set; }
/// <summary>
/// Record how many inbound packets could not be associated with a simulator circuit.
/// </summary>
public int IncomingOrphanedPacketCount { get; private set; }
/// <summary> /// <summary>
/// Record current outgoing client for monitoring purposes. /// Record current outgoing client for monitoring purposes.
/// </summary> /// </summary>
@ -1206,7 +1224,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if ((IncomingMalformedPacketCount % 10000) == 0) if ((IncomingMalformedPacketCount % 10000) == 0)
m_log.WarnFormat( m_log.WarnFormat(
"[LLUDPSERVER]: Received {0} malformed packets so far, probable network attack. Last malformed was from {1}", "[LLUDPSERVER]: Received {0} malformed packets so far, probable network attack. Last was from {1}",
IncomingMalformedPacketCount, endPoint); IncomingMalformedPacketCount, endPoint);
} }
@ -1279,9 +1297,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
if (IncomingMalformedPacketCount < 100) if (IncomingMalformedPacketCount < 100)
{ {
m_log.ErrorFormat("[LLUDPSERVER]: Malformed data, cannot parse {0} byte packet from {1}:", m_log.WarnFormat("[LLUDPSERVER]: Malformed data, cannot parse {0} byte packet from {1}, data {2}:",
buffer.DataLength, buffer.RemoteEndPoint); buffer.DataLength, buffer.RemoteEndPoint, Utils.BytesToHexString(buffer.Data, buffer.DataLength, null));
m_log.Error(Utils.BytesToHexString(buffer.Data, buffer.DataLength, null));
} }
RecordMalformedInboundPacket(endPoint); RecordMalformedInboundPacket(endPoint);
@ -1323,6 +1340,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (!m_scene.TryGetClient(endPoint, out client) || !(client is LLClientView)) if (!m_scene.TryGetClient(endPoint, out client) || !(client is LLClientView))
{ {
//m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
IncomingOrphanedPacketCount++;
if ((IncomingOrphanedPacketCount % 10000) == 0)
m_log.WarnFormat(
"[LLUDPSERVER]: Received {0} orphaned packets so far. Last was from {1}",
IncomingOrphanedPacketCount, endPoint);
return; return;
} }