aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-08-30 21:33:55 +0000
committerJustin Clarke Casey2008-08-30 21:33:55 +0000
commitc713ec8223c95c9b2503f61a5ef8e55d463dbea3 (patch)
tree8842cef7a951b0e9a9ceaa7a412b8b01d991fff7 /OpenSim/Region/ClientStack
parent* Apply cmickeyb's patch from mantis 2068 (diff)
downloadopensim-SC_OLD-c713ec8223c95c9b2503f61a5ef8e55d463dbea3.zip
opensim-SC_OLD-c713ec8223c95c9b2503f61a5ef8e55d463dbea3.tar.gz
opensim-SC_OLD-c713ec8223c95c9b2503f61a5ef8e55d463dbea3.tar.bz2
opensim-SC_OLD-c713ec8223c95c9b2503f61a5ef8e55d463dbea3.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs17
1 files changed, 3 insertions, 14 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 7c21df2..8dec185 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
158 try 158 try
159 { 159 {
160 numBytes = m_socket.EndReceiveFrom(result, ref epSender); 160 numBytes = m_socket.EndReceiveFrom(result, ref epSender);
161 ok = true; 161 ok = true;
162 } 162 }
163 catch (SocketException e) 163 catch (SocketException e)
164 { 164 {
@@ -250,20 +250,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
250 SendPacketTo(ack_it.ToBytes(),ack_it.ToBytes().Length,SocketFlags.None,p.CircuitCode.Code); 250 SendPacketTo(ack_it.ToBytes(),ack_it.ToBytes().Length,SocketFlags.None,p.CircuitCode.Code);
251 } 251 }
252 } 252 }
253 catch (Exception) 253 catch (Exception e)
254 { 254 {
255 m_log.Error("[UDPSERVER]: Exception in processing packet."); 255 m_log.Error("[UDPSERVER]: Exception in processing packet - ignoring: ", e);
256 m_log.Debug("[UDPSERVER]: Adding New Client");
257 try
258 {
259 AddNewClient(packet);
260 }
261 catch (Exception e3)
262 {
263 m_log.Error("[UDPSERVER]: Adding New Client threw exception " + e3.ToString());
264 m_socket.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender,
265 ReceivedData, null);
266 }
267 } 256 }
268 } 257 }
269 } 258 }