diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/UDPServer.cs | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index 59eec0c..dc76c20 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs | |||
@@ -112,7 +112,7 @@ namespace OpenSim.Region.ClientStack | |||
112 | { | 112 | { |
113 | // TODO : Actually only handle those states that we have control over, re-throw everything else, | 113 | // TODO : Actually only handle those states that we have control over, re-throw everything else, |
114 | // TODO: implement cases as we encounter them. | 114 | // TODO: implement cases as we encounter them. |
115 | m_log.Error("UDPSERVER", "Connection Error! - " + e.ToString()); | 115 | //m_log.Error("UDPSERVER", "Connection Error! - " + e.ToString()); |
116 | switch (e.SocketErrorCode) | 116 | switch (e.SocketErrorCode) |
117 | { | 117 | { |
118 | case SocketError.AlreadyInProgress: | 118 | case SocketError.AlreadyInProgress: |
@@ -156,7 +156,7 @@ namespace OpenSim.Region.ClientStack | |||
156 | { | 156 | { |
157 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, | 157 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, |
158 | ReceivedData, null); | 158 | ReceivedData, null); |
159 | 159 | ||
160 | // Ter: For some stupid reason ConnectionReset basically kills our async event structure.. | 160 | // Ter: For some stupid reason ConnectionReset basically kills our async event structure.. |
161 | // so therefore.. we've got to tell the server to BeginReceiveFrom again. | 161 | // so therefore.. we've got to tell the server to BeginReceiveFrom again. |
162 | // This will happen over and over until we've gone through all packets | 162 | // This will happen over and over until we've gone through all packets |
@@ -180,9 +180,9 @@ namespace OpenSim.Region.ClientStack | |||
180 | 180 | ||
181 | return; | 181 | return; |
182 | } | 182 | } |
183 | catch (ObjectDisposedException e) | 183 | catch (ObjectDisposedException) |
184 | { | 184 | { |
185 | m_log.Warn("UDPSERVER", "Connection Error! - " + e.ToString()); | 185 | |
186 | //MainLog.Instance.Debug("UDPSERVER", e.ToString()); | 186 | //MainLog.Instance.Debug("UDPSERVER", e.ToString()); |
187 | return; | 187 | return; |
188 | } | 188 | } |
@@ -193,18 +193,9 @@ namespace OpenSim.Region.ClientStack | |||
193 | { | 193 | { |
194 | packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer); | 194 | packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer); |
195 | } | 195 | } |
196 | catch (Exception e) | 196 | catch (Exception) |
197 | { | 197 | { |
198 | MainLog.Instance.Warn("UDPSERVER","Packet Error! - " + e.ToString()); | 198 | |
199 | try | ||
200 | { | ||
201 | packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer); | ||
202 | MainLog.Instance.Warn("UDPSERVER", "Recovered from Packet Error - " + e.ToString()); | ||
203 | } | ||
204 | catch (Exception e2) | ||
205 | { | ||
206 | MainLog.Instance.Warn("UDPSERVER", "2nd Packet Error! - " + e.ToString()); | ||
207 | } | ||
208 | } | 199 | } |
209 | 200 | ||
210 | if (packet != null) | 201 | if (packet != null) |
@@ -227,7 +218,7 @@ namespace OpenSim.Region.ClientStack | |||
227 | { | 218 | { |
228 | // invalid client | 219 | // invalid client |
229 | //CFK: This message seems to have served its usefullness as of 12-15 so I am commenting it out for now | 220 | //CFK: This message seems to have served its usefullness as of 12-15 so I am commenting it out for now |
230 | m_log.Warn("UDPSERVER", "Got a packet from an invalid client - " + packet.ToString()); | 221 | //m_log.Warn("UDPSERVER", "Got a packet from an invalid client - " + packet.ToString()); |
231 | 222 | ||
232 | } | 223 | } |
233 | } | 224 | } |