ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 13:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed a null NewPack error in ClientView.InPacket (object pool returning null objects?)

Browse Source
This commit is contained in:
Teravus Ovares
2007-12-20 14:44:59 +00:00
parent 76255c4793
commit 2641f78a20
2 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
OpenSim/Region/ClientStack/ClientView.cs
View File

@@ -2217,44 +2217,48 @@ namespace OpenSim.Region.ClientStack
public virtual void InPacket(Packet NewPack)
{
// Handle appended ACKs
if (NewPack.Header.AppendedAcks)
if (NewPack != null)
{
lock (m_needAck)
if (NewPack.Header.AppendedAcks)
{
foreach (uint ack in NewPack.Header.AckList)
lock (m_needAck)
{
m_needAck.Remove(ack);
foreach (uint ack in NewPack.Header.AckList)
{
m_needAck.Remove(ack);
}
}
}
}
// Handle PacketAck packets
if (NewPack.Type == PacketType.PacketAck)
{
PacketAckPacket ackPacket = (PacketAckPacket) NewPack;
lock (m_needAck)
// Handle PacketAck packets
if (NewPack.Type == PacketType.PacketAck)
{
foreach (PacketAckPacket.PacketsBlock block in ackPacket.Packets)
PacketAckPacket ackPacket = (PacketAckPacket) NewPack;
lock (m_needAck)
{
m_needAck.Remove(block.ID);
foreach (PacketAckPacket.PacketsBlock block in ackPacket.Packets)
{
m_needAck.Remove(block.ID);
}
}
}
}
else if ((NewPack.Type == PacketType.StartPingCheck))
{
//reply to pingcheck
StartPingCheckPacket startPing = (StartPingCheckPacket) NewPack;
CompletePingCheckPacket endPing = new CompletePingCheckPacket();
endPing.PingID.PingID = startPing.PingID.PingID;
OutPacket(endPing, ThrottleOutPacketType.Task);
}
else
{
QueItem item = new QueItem();
item.Packet = NewPack;
item.Incoming = true;
m_packetQueue.Enqueue(item);
else if ((NewPack.Type == PacketType.StartPingCheck))
{
//reply to pingcheck
StartPingCheckPacket startPing = (StartPingCheckPacket) NewPack;
CompletePingCheckPacket endPing = new CompletePingCheckPacket();
endPing.PingID.PingID = startPing.PingID.PingID;
OutPacket(endPing, ThrottleOutPacketType.Task);
}
else
{
QueItem item = new QueItem();
item.Packet = NewPack;
item.Incoming = true;
m_packetQueue.Enqueue(item);
}
}
}