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

[Modify] Rename it

Browse Source
This commit is contained in:
sta
2016-12-07 17:03:15 +09:00
parent 6f2708dca5
commit 2b06dedec9
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
websocket-sharp/WebSocket.cs
View File

@@ -99,6 +99,7 @@ namespace WebSocketSharp
private Queue<MessageEventArgs> _messageEventQueue; private Queue<MessageEventArgs> _messageEventQueue;
private uint _nonceCount; private uint _nonceCount;
private string _origin; private string _origin;
private ManualResetEvent _pongReceived;
private bool _preAuth; private bool _preAuth;
private string _protocol; private string _protocol;
private string[] _protocols; private string[] _protocols;
@@ -106,7 +107,6 @@ namespace WebSocketSharp
private NetworkCredential _proxyCredentials; private NetworkCredential _proxyCredentials;
private Uri _proxyUri; private Uri _proxyUri;
private volatile WebSocketState _readyState; private volatile WebSocketState _readyState;
private ManualResetEvent _receivePong;
private int _retryCountForConnect; private int _retryCountForConnect;
private bool _secure; private bool _secure;
private ClientSslConfiguration _sslConfig; private ClientSslConfiguration _sslConfig;
@@ -1325,17 +1325,17 @@ namespace WebSocketSharp
if (_readyState != WebSocketState.Open) if (_readyState != WebSocketState.Open)
return false; return false;
var receivePong = _receivePong; var pongReceived = _pongReceived;
if (receivePong == null) if (pongReceived == null)
return false; return false;
lock (_forPing) { lock (_forPing) {
try { try {
receivePong.Reset (); pongReceived.Reset ();
if (!send (Fin.Final, Opcode.Ping, data, false)) if (!send (Fin.Final, Opcode.Ping, data, false))
return false; return false;
return receivePong.WaitOne (_waitTime); return pongReceived.WaitOne (_waitTime);
} }
catch (ObjectDisposedException) { catch (ObjectDisposedException) {
return false; return false;
@@ -1418,7 +1418,7 @@ namespace WebSocketSharp
private bool processPongFrame (WebSocketFrame frame) private bool processPongFrame (WebSocketFrame frame)
{ {
try { try {
_receivePong.Set (); _pongReceived.Set ();
} }
catch (NullReferenceException) { catch (NullReferenceException) {
return false; return false;
@@ -1533,9 +1533,9 @@ namespace WebSocketSharp
_inContinuation = false; _inContinuation = false;
} }
if (_receivePong != null) { if (_pongReceived != null) {
_receivePong.Close (); _pongReceived.Close ();
_receivePong = null; _pongReceived = null;
} }
if (_exitReceiving != null) { if (_exitReceiving != null) {
@@ -1873,7 +1873,7 @@ namespace WebSocketSharp
_messageEventQueue.Clear (); _messageEventQueue.Clear ();
_exitReceiving = new ManualResetEvent (false); _exitReceiving = new ManualResetEvent (false);
_receivePong = new ManualResetEvent (false); _pongReceived = new ManualResetEvent (false);
Action receive = null; Action receive = null;
receive = receive =
@@ -2190,13 +2190,13 @@ namespace WebSocketSharp
if (_readyState != WebSocketState.Open) if (_readyState != WebSocketState.Open)
return false; return false;
var receivePong = _receivePong; var pongReceived = _pongReceived;
if (receivePong == null) if (pongReceived == null)
return false; return false;
lock (_forPing) { lock (_forPing) {
try { try {
receivePong.Reset (); pongReceived.Reset ();
lock (_forState) { lock (_forState) {
if (_readyState != WebSocketState.Open) { if (_readyState != WebSocketState.Open) {
@@ -2208,7 +2208,7 @@ namespace WebSocketSharp
return false; return false;
} }
return receivePong.WaitOne (timeout); return pongReceived.WaitOne (timeout);
} }
catch (ObjectDisposedException) { catch (ObjectDisposedException) {
return false; return false;