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

[Modify] Not return a bool

Browse Source
This commit is contained in:
sta 2016-11-13 17:35:42 +09:00
parent 1938011fea
commit 0d9240c58a
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
websocket-sharp/WebSocket.cs
View File

@ -1050,13 +1050,10 @@ namespace WebSocketSharp
return false; return false;
} }
try { _readyState = WebSocketState.Connecting;
_readyState = WebSocketState.Connecting;
if (!doHandshake ())
return false;
_retryCountForConnect = 1; try {
_readyState = WebSocketState.Open; doHandshake ();
} }
catch (Exception ex) { catch (Exception ex) {
_retryCountForConnect++; _retryCountForConnect++;
@ -1066,6 +1063,9 @@ namespace WebSocketSharp
return false; return false;
} }
_retryCountForConnect = 1;
_readyState = WebSocketState.Open;
return true; return true;
} }
} }
@ -1174,19 +1174,14 @@ namespace WebSocketSharp
} }
// As client // As client
private bool doHandshake () private void doHandshake ()
{ {
setClientStream (); setClientStream ();
var res = sendHandshakeRequest (); var res = sendHandshakeRequest ();
string msg; string msg;
if (!checkHandshakeResponse (res, out msg)) { if (!checkHandshakeResponse (res, out msg))
_retryCountForConnect++; throw new WebSocketException (CloseStatusCode.ProtocolError, msg);
_logger.Fatal (msg);
fatal ("An error has occurred while connecting.", CloseStatusCode.ProtocolError);
return false;
}
if (_protocolsRequested) if (_protocolsRequested)
_protocol = res.Headers["Sec-WebSocket-Protocol"]; _protocol = res.Headers["Sec-WebSocket-Protocol"];
@ -1195,8 +1190,6 @@ namespace WebSocketSharp
processSecWebSocketExtensionsServerHeader (res.Headers["Sec-WebSocket-Extensions"]); processSecWebSocketExtensionsServerHeader (res.Headers["Sec-WebSocket-Extensions"]);
processCookies (res.Cookies); processCookies (res.Cookies);
return true;
} }
private void enqueueToMessageEventQueue (MessageEventArgs e) private void enqueueToMessageEventQueue (MessageEventArgs e)