From 08bdca8fe8961a66bed0e1049918efad5add787c Mon Sep 17 00:00:00 2001 From: sta Date: Mon, 6 Jan 2014 17:22:34 +0900 Subject: [PATCH] Connect and ConnectAsync methods aren't available as a server --- websocket-sharp/WebSocket.cs | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index 48da92e8..8648bb6c 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -692,6 +692,7 @@ namespace WebSocketSharp return true; } + // As client private bool connect () { lock (_forConnect) { @@ -704,7 +705,7 @@ namespace WebSocketSharp } try { - if (_client ? doHandshake () : acceptHandshake ()) { + if (doHandshake ()) { _readyState = WebSocketState.OPEN; return true; } @@ -1592,8 +1593,13 @@ namespace WebSocketSharp /// public void Connect () { - if (IsOpened) { - var msg = "A WebSocket connection has already been established."; + var msg = !_client + ? "Connect isn't available as a server." + : IsOpened + ? "A WebSocket connection has already been established." + : null; + + if (msg != null) { _logger.Error (msg); error (msg); @@ -1612,8 +1618,13 @@ namespace WebSocketSharp /// public void ConnectAsync () { - if (IsOpened) { - var msg = "A WebSocket connection has already been established."; + var msg = !_client + ? "ConnectAsync isn't available as a server." + : IsOpened + ? "A WebSocket connection has already been established." + : null; + + if (msg != null) { _logger.Error (msg); error (msg);