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

* Committed patch in mantis 623 

* Unpatched code certainly looks bizarre - attempts to add a new client if we encountered a failure in processing a packet.  No apparant ill effects on a sniff test.
* Thanks openlifegrid
0.6.0-stable
Justin Clarke Casey 2008-08-30 21:33:55 +00:00
parent e4ec9829cd
commit c713ec8223
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -158,7 +158,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
try try
{ {
numBytes = m_socket.EndReceiveFrom(result, ref epSender); numBytes = m_socket.EndReceiveFrom(result, ref epSender);
ok = true; ok = true;
} }
catch (SocketException e) catch (SocketException e)
{ {
@ -250,20 +250,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
SendPacketTo(ack_it.ToBytes(),ack_it.ToBytes().Length,SocketFlags.None,p.CircuitCode.Code); SendPacketTo(ack_it.ToBytes(),ack_it.ToBytes().Length,SocketFlags.None,p.CircuitCode.Code);
} }
} }
catch (Exception) catch (Exception e)
{ {
m_log.Error("[UDPSERVER]: Exception in processing packet."); m_log.Error("[UDPSERVER]: Exception in processing packet - ignoring: ", e);
m_log.Debug("[UDPSERVER]: Adding New Client");
try
{
AddNewClient(packet);
}
catch (Exception e3)
{
m_log.Error("[UDPSERVER]: Adding New Client threw exception " + e3.ToString());
m_socket.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender,
ReceivedData, null);
}
} }
} }
} }