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

* refactor: Split BeginRecieve() into BeginReceive() and BeginRobustReceive()

0.6.0-stable
Justin Clarke Casey 2008-11-06 20:10:39 +00:00
parent 5a852321e0
commit d31d02c373
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,7 +231,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
BeginReceive(); BeginRobustReceive();
if (packet != null) if (packet != null)
{ {
@ -274,16 +274,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_log.Error("[CLIENT]: Exception in processing packet - ignoring: ", e); m_log.Error("[CLIENT]: Exception in processing packet - ignoring: ", e);
} }
} }
/// <summary> /// <summary>
/// Begin an asynchronous receive of the next bit of raw data /// Begin an asynchronous receive of the next bit of raw data
/// </summary> /// </summary>
protected virtual void BeginReceive() protected virtual void BeginReceive()
{
m_socket.BeginReceiveFrom(
RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref reusedEpSender, ReceivedData, null);
}
/// <summary>
/// Begin a robust asynchronous receive of the next bit of raw data. Robust means that SocketExceptions are
/// automatically dealt with until the next set of valid UDP data is received.
/// </summary>
private void BeginRobustReceive()
{ {
try try
{ {
m_socket.BeginReceiveFrom( BeginReceive();
RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref reusedEpSender, ReceivedData, null);
} }
catch (SocketException e) catch (SocketException e)
{ {
@ -293,7 +302,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// the next set of UDP data is for a valid client. // the next set of UDP data is for a valid client.
ResetServerEndPoint(e); ResetServerEndPoint(e);
} }
} }
/// <summary> /// <summary>
/// Reset the server endpoint /// Reset the server endpoint
@ -301,7 +310,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <param name="e"> /// <param name="e">
/// The exception that has triggered the reset. Can be null if there was no exception. /// The exception that has triggered the reset. Can be null if there was no exception.
/// </param> /// </param>
protected void ResetServerEndPoint(Exception e) private void ResetServerEndPoint(Exception e)
{ {
try try
{ {
@ -315,8 +324,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// ENDLESS LOOP ON PURPOSE! // ENDLESS LOOP ON PURPOSE!
// We need to purge the UDP stream of crap from the client that disconnected nastily or the UDP server will die // We need to purge the UDP stream of crap from the client that disconnected nastily or the UDP server will die
// The only way to do that is to beginreceive again! // The only way to do that is to BeginRobustReceive again!
BeginReceive(); BeginRobustReceive();
} }
/// <summary> /// <summary>
@ -470,8 +479,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_log.Info("[UDPSERVER]: UDP socket bound, getting ready to listen"); m_log.Info("[UDPSERVER]: UDP socket bound, getting ready to listen");
ReceivedData = OnReceivedData; ReceivedData = OnReceivedData;
m_socket.BeginReceiveFrom( BeginReceive();
RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref reusedEpSender, ReceivedData, null);
m_log.Info("[UDPSERVER]: Listening on port " + newPort); m_log.Info("[UDPSERVER]: Listening on port " + newPort);
} }

2
OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
View File

@ -52,7 +52,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
{ {
ChunkSenderTuple tuple = m_chunksToLoad.Dequeue(); ChunkSenderTuple tuple = m_chunksToLoad.Dequeue();
reusedEpSender = tuple.Sender; reusedEpSender = tuple.Sender;
ResetServerEndPoint(new SocketException()); throw new SocketException();
ReceiveData(null); ReceiveData(null);
} }
} }