DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Modify] Polish it

Browse Source 
More clearly received or not.
This commit is contained in:
sta
2015-10-17 15:31:00 +09:00
parent 39add76329
commit 1f40f8e566
4 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
websocket-sharp/Server/WebSocketServiceHost.cs
View File

@@ -132,8 +132,7 @@ namespace WebSocketSharp.Server
var e = new CloseEventArgs (code, reason);
var send = !code.IsReserved ();
var bytes = send ? WebSocketFrame.CreateCloseFrame (e.PayloadData, false).ToArray () : null;
var timeout = send ? WaitTime : TimeSpan.Zero;
Sessions.Stop (e, bytes, timeout);
Sessions.Stop (e, bytes, send);
}
#endregion

9
websocket-sharp/Server/WebSocketServiceManager.cs
View File

@@ -356,17 +356,14 @@ namespace WebSocketSharp.Server
}
}
internal void Stop (CloseEventArgs e, bool send, bool wait)
internal void Stop (CloseEventArgs e, bool send, bool receive)
{
lock (_sync) {
_state = ServerState.ShuttingDown;
var bytes = send
? WebSocketFrame.CreateCloseFrame (e.PayloadData, false).ToArray ()
: null;
var timeout = wait ? _waitTime : TimeSpan.Zero;
var bytes = send ? WebSocketFrame.CreateCloseFrame (e.PayloadData, false).ToArray () : null;
foreach (var host in _hosts.Values)
host.Sessions.Stop (e, bytes, timeout);
host.Sessions.Stop (e, bytes, receive);
_hosts.Clear ();
_state = ServerState.Stop;

4
websocket-sharp/Server/WebSocketSessionManager.cs
View File

@@ -368,14 +368,14 @@ namespace WebSocketSharp.Server
}
}
internal void Stop (CloseEventArgs e, byte[] frameAsBytes, TimeSpan timeout)
internal void Stop (CloseEventArgs e, byte[] frameAsBytes, bool receive)
{
lock (_sync) {
_state = ServerState.ShuttingDown;
_sweepTimer.Enabled = false;
foreach (var session in _sessions.Values.ToList ())
session.Context.WebSocket.Close (e, frameAsBytes, timeout);
session.Context.WebSocket.Close (e, frameAsBytes, receive);
_state = ServerState.Stop;
}