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

Modified connecting

Browse Source
This commit is contained in:
sta 2014-01-28 17:10:36 +09:00
parent aea4ca8c9a
commit 2c1078d75c
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
websocket-sharp/Ext.cs
View File

@ -205,6 +205,13 @@ namespace WebSocketSharp
: null;
}
internal static string CheckIfConnectable (this WebSocketState state)
{
return state == WebSocketState.OPEN || state == WebSocketState.CLOSING
? "A WebSocket connection has already been established."
: null;
}
internal static string CheckIfOpen (this WebSocketState state)
{
return state == WebSocketState.CONNECTING

28
websocket-sharp/WebSocket.cs
View File

@ -637,6 +637,13 @@ namespace WebSocketSharp
return false;
}
private string checkIfCanConnect ()
{
return !_client && _readyState == WebSocketState.CLOSED
? "Connect isn't available to reconnect as a server."
: _readyState.CheckIfConnectable ();
}
// As server
private string checkIfValidHandshakeRequest (WebSocketContext context)
{
@ -820,12 +827,11 @@ namespace WebSocketSharp
frame, CloseStatusCode.INCORRECT_DATA, null);
}
// As client
private bool connect ()
{
lock (_forConn) {
if (IsConnected) {
var msg = "A WebSocket connection has already been established.";
var msg = _readyState.CheckIfConnectable ();
if (msg != null) {
_logger.Error (msg);
error (msg);
@ -833,7 +839,7 @@ namespace WebSocketSharp
}
try {
if (doHandshake ()) {
if (_client ? doHandshake () : acceptHandshake ()) {
_readyState = WebSocketState.OPEN;
return true;
}
@ -1746,12 +1752,7 @@ namespace WebSocketSharp
/// </summary>
public void Connect ()
{
var msg = !_client
? "Connect isn't available as a server."
: IsConnected
? "A WebSocket connection has already been established."
: null;
var msg = checkIfCanConnect ();
if (msg != null) {
_logger.Error (msg);
error (msg);
@ -1771,12 +1772,7 @@ namespace WebSocketSharp
/// </remarks>
public void ConnectAsync ()
{
var msg = !_client
? "ConnectAsync isn't available as a server."
: IsConnected
? "A WebSocket connection has already been established."
: null;
var msg = checkIfCanConnect ();
if (msg != null) {
_logger.Error (msg);
error (msg);