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

Add a parameter that limits the max size of the outbound packet. Defaulted 

at 1400 since the headers get added to that (32 bytes plus UDP headers)
0.6.5-rc1
Melanie Thielker 2009-05-04 02:24:30 +00:00
parent 8ac4ec738b
commit b44a56e0b4
2 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -140,6 +140,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
protected int m_primTerseUpdateRate = 10; protected int m_primTerseUpdateRate = 10;
protected int m_primFullUpdateRate = 14; protected int m_primFullUpdateRate = 14;
protected int m_packetMTU = 1400;
// LLClientView Only // LLClientView Only
public delegate void BinaryGenericMessage(Object sender, string method, byte[][] args); public delegate void BinaryGenericMessage(Object sender, string method, byte[][] args);
@ -537,6 +539,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_primFullUpdateRate = clientConfig.GetInt("FullUpdateRate", m_primFullUpdateRate = clientConfig.GetInt("FullUpdateRate",
m_primFullUpdateRate); m_primFullUpdateRate);
m_packetMTU = clientConfig.GetInt("PacketMTU", 1400);
} }
} }
@ -3013,9 +3016,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
outPacket.RegionData.TimeDilation = outPacket.RegionData.TimeDilation =
(ushort)(Scene.TimeDilation * ushort.MaxValue); (ushort)(Scene.TimeDilation * ushort.MaxValue);
int count = m_primFullUpdates.Count; int max = m_primFullUpdates.Count;
if (count > m_primFullUpdatesPerPacket) if (max > m_primFullUpdatesPerPacket)
count = m_primFullUpdatesPerPacket; max = m_primFullUpdatesPerPacket;
int count = 0;
int size = 0;
byte[] zerobuffer = new byte[1024];
byte[] blockbuffer = new byte[1024];
for (count = 0 ; count < max ; count++)
{
int length = 0;
m_primFullUpdates[count].ToBytes(blockbuffer, ref length);
length = Helpers.ZeroEncode(blockbuffer, length, zerobuffer);
if (size + length > m_packetMTU)
break;
size += length;
}
outPacket.ObjectData = outPacket.ObjectData =
new ObjectUpdatePacket.ObjectDataBlock[count]; new ObjectUpdatePacket.ObjectDataBlock[count];
@ -3083,9 +3102,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
outPacket.RegionData.TimeDilation = outPacket.RegionData.TimeDilation =
(ushort)(Scene.TimeDilation * ushort.MaxValue); (ushort)(Scene.TimeDilation * ushort.MaxValue);
int count = m_primTerseUpdates.Count; int max = m_primTerseUpdates.Count;
if (count > m_primTerseUpdatesPerPacket) if (max > m_primTerseUpdatesPerPacket)
count = m_primTerseUpdatesPerPacket; max = m_primTerseUpdatesPerPacket;
int count = 0;
int size = 0;
byte[] zerobuffer = new byte[1024];
byte[] blockbuffer = new byte[1024];
for (count = 0 ; count < max ; count++)
{
int length = 0;
m_primTerseUpdates[count].ToBytes(blockbuffer, ref length);
length = Helpers.ZeroEncode(blockbuffer, length, zerobuffer);
if (size + length > m_packetMTU)
break;
size += length;
}
outPacket.ObjectData = outPacket.ObjectData =
new ImprovedTerseObjectUpdatePacket. new ImprovedTerseObjectUpdatePacket.

2
bin/OpenSim.ini.example
View File

@ -1285,3 +1285,5 @@
;FullUpdatesPerPacket=14 ;FullUpdatesPerPacket=14
;TerseUpdateRate=10 ;TerseUpdateRate=10
;FullUpdateRate=14 ;FullUpdateRate=14
;PacketMTU = 1400