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-02-02 15:24:52 +09:00
parent a1abb054f6
commit 008ccc3fec
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
websocket-sharp/WebSocket.cs
View File

@ -667,7 +667,7 @@ namespace WebSocketSharp
_logger.Debug (String.Format ("A request from {0}:\n{1}", _context.UserEndPoint, _context)); _logger.Debug (String.Format ("A request from {0}:\n{1}", _context.UserEndPoint, _context));
string msg; string msg;
if (!checkIfValidHandshakeRequest (_context, out msg)) { if (!checkHandshakeRequest (_context, out msg)) {
sendHttpResponse (createHandshakeFailureResponse (HttpStatusCode.BadRequest)); sendHttpResponse (createHandshakeFailureResponse (HttpStatusCode.BadRequest));
throw new WebSocketException (CloseStatusCode.ProtocolError, msg); throw new WebSocketException (CloseStatusCode.ProtocolError, msg);
} }
@ -688,18 +688,8 @@ namespace WebSocketSharp
return sendHttpResponse (createHandshakeResponse ()); return sendHttpResponse (createHandshakeResponse ());
} }
private string checkIfAvailable (
bool client, bool server, bool connecting, bool open, bool closing, bool closed)
{
return !client && _client
? "This operation isn't available in: client"
: !server && !_client
? "This operation isn't available in: server"
: _readyState.CheckIfAvailable (connecting, open, closing, closed);
}
// As server // As server
private bool checkIfValidHandshakeRequest (WebSocketContext context, out string message) private bool checkHandshakeRequest (WebSocketContext context, out string message)
{ {
message = null; message = null;
@ -727,6 +717,16 @@ namespace WebSocketSharp
return true; return true;
} }
private string checkIfAvailable (
bool client, bool server, bool connecting, bool open, bool closing, bool closed)
{
return !client && _client
? "This operation isn't available in: client"
: !server && !_client
? "This operation isn't available in: server"
: _readyState.CheckIfAvailable (connecting, open, closing, closed);
}
// As client // As client
private bool checkIfValidHandshakeResponse (HttpResponse response, out string message) private bool checkIfValidHandshakeResponse (HttpResponse response, out string message)
{ {