Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions websocket-sharp/Server/WebSocketSessionManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1622,38 +1622,43 @@ public void Sweep()
_sweeping = true;
}

foreach (var id in InactiveIDs)
try
{
if (_state != ServerState.Start)
break;

lock (_sync)
foreach (var id in InactiveIDs)
{
if (_state != ServerState.Start)
break;

IWebSocketSession session;
lock (_sync)
{
if (_state != ServerState.Start)
break;

if (!_sessions.TryGetValue(id, out session))
continue;
IWebSocketSession session;

var state = session.WebSocket.ReadyState;
if (!_sessions.TryGetValue(id, out session))
continue;

if (state == WebSocketState.Open)
{
session.WebSocket.Close(CloseStatusCode.Abnormal);
var state = session.WebSocket.ReadyState;

continue;
}
if (state == WebSocketState.Open)
{
session.WebSocket.Close(CloseStatusCode.Abnormal);

continue;
}

if (state == WebSocketState.Closing)
continue;
if (state == WebSocketState.Closing)
continue;

_sessions.Remove(id);
_sessions.Remove(id);
}
}
}

_sweeping = false;
finally
{
_sweeping = false;
}
}

/// <summary>
Expand Down
33 changes: 14 additions & 19 deletions websocket-sharp/WebSocket.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1369,10 +1369,10 @@ private bool closeHandshake(
frame.Unmask();
}

var wait = !received && sent && _receivingExited != null;
var exited = _receivingExited;

if (wait)
received = _receivingExited.WaitOne(_waitTime);
if (!received && sent && exited != null)
received = exited.WaitOne(_waitTime);

var ret = sent && received;

Expand Down Expand Up @@ -1946,7 +1946,12 @@ private bool processPongFrame(WebSocketFrame frame)

try
{
_pongReceived.Set();
var received = _pongReceived;

if (received == null)
return false;

received.Set();
}
catch (NullReferenceException)
{
Expand Down Expand Up @@ -2095,19 +2100,9 @@ private void releaseCommonResources()
_inContinuation = false;
}

if (_pongReceived != null)
{
_pongReceived.Close();

_pongReceived = null;
}

if (_receivingExited != null)
{
_receivingExited.Close();

_receivingExited = null;
}
_pongReceived = null;
_receivingExited = null;
}

private void releaseResources()
Expand Down Expand Up @@ -2727,9 +2722,9 @@ internal void Close(PayloadData payloadData, byte[] rawFrame)
_log.Trace("Begin closing the connection.");

var sent = rawFrame != null && sendBytes(rawFrame);
var received = sent && _receivingExited != null
? _receivingExited.WaitOne(_waitTime)
: false;

var exited = _receivingExited;
var received = sent && exited != null && exited.WaitOne(_waitTime);

var res = sent && received;

Expand Down
Loading