From 7deddda2f93fea3ff337f52824a40236a60791ee Mon Sep 17 00:00:00 2001 From: sta Date: Sat, 3 Aug 2013 17:46:06 +0900 Subject: [PATCH] Renamed ResponseHandshake.cs to HandshakeResponse.cs --- ...ponseHandshake.cs => HandshakeResponse.cs} | 16 +-- websocket-sharp/WebSocket.cs | 104 +++++++++--------- websocket-sharp/websocket-sharp.csproj | 2 +- 3 files changed, 61 insertions(+), 61 deletions(-) rename websocket-sharp/{ResponseHandshake.cs => HandshakeResponse.cs} (91%) diff --git a/websocket-sharp/ResponseHandshake.cs b/websocket-sharp/HandshakeResponse.cs similarity index 91% rename from websocket-sharp/ResponseHandshake.cs rename to websocket-sharp/HandshakeResponse.cs index 6badcc48..e6c862e2 100644 --- a/websocket-sharp/ResponseHandshake.cs +++ b/websocket-sharp/HandshakeResponse.cs @@ -1,6 +1,6 @@ #region License /* - * ResponseHandshake.cs + * HandshakeResponse.cs * * The MIT License * @@ -33,18 +33,18 @@ using WebSocketSharp.Net; namespace WebSocketSharp { - internal class ResponseHandshake : HandshakeBase + internal class HandshakeResponse : HandshakeBase { #region Public Constructors - public ResponseHandshake () + public HandshakeResponse () : this (HttpStatusCode.SwitchingProtocols) { AddHeader ("Upgrade", "websocket"); AddHeader ("Connection", "Upgrade"); } - public ResponseHandshake (HttpStatusCode code) + public HandshakeResponse (HttpStatusCode code) { StatusCode = ((int) code).ToString (); Reason = code.GetDescription (); @@ -101,15 +101,15 @@ namespace WebSocketSharp #region Public Methods - public static ResponseHandshake CreateCloseResponse (HttpStatusCode code) + public static HandshakeResponse CreateCloseResponse (HttpStatusCode code) { - var res = new ResponseHandshake (code); + var res = new HandshakeResponse (code); res.AddHeader ("Connection", "close"); return res; } - public static ResponseHandshake Parse (string [] response) + public static HandshakeResponse Parse (string [] response) { var statusLine = response [0].Split (' '); if (statusLine.Length < 3) @@ -123,7 +123,7 @@ namespace WebSocketSharp for (int i = 1; i < response.Length; i++) headers.SetInternal (response [i], true); - return new ResponseHandshake { + return new HandshakeResponse { Headers = headers, Reason = reason.ToString (), StatusCode = statusLine [1], diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index 0107b84d..5cab0025 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -500,7 +500,7 @@ namespace WebSocketSharp { private bool acceptHandshake () { return processHandshakeRequest () - ? send (createResponseHandshake ()) + ? send (createHandshakeResponse ()) : false; } @@ -532,7 +532,7 @@ namespace WebSocketSharp { if (state == WsState.CONNECTING) { if (!_client) - args.WasClean = send (createResponseHandshake (HttpStatusCode.BadRequest)); + args.WasClean = send (createHandshakeResponse (HttpStatusCode.BadRequest)); } else { @@ -708,19 +708,6 @@ namespace WebSocketSharp { return frame; } - // As client - private string createRequestExtensions() - { - var extensions = new StringBuilder(64); - var comp = createCompressionExtension(_compression); - if (comp.Length > 0) - extensions.Append(comp); - - return extensions.Length > 0 - ? extensions.ToString() - : String.Empty; - } - // As client private HandshakeRequest createHandshakeRequest () { @@ -756,43 +743,56 @@ namespace WebSocketSharp { } // As server - private ResponseHandshake createResponseHandshake() + private HandshakeResponse createHandshakeResponse () { - var res = new ResponseHandshake(); - res.AddHeader("Sec-WebSocket-Accept", createResponseKey()); + var res = new HandshakeResponse (); + res.AddHeader ("Sec-WebSocket-Accept", createResponseKey ()); if (_extensions.Length > 0) - res.AddHeader("Sec-WebSocket-Extensions", _extensions); + res.AddHeader ("Sec-WebSocket-Extensions", _extensions); if (_cookies.Count > 0) - res.SetCookies(_cookies); + res.SetCookies (_cookies); return res; } // As server - private ResponseHandshake createResponseHandshake(HttpStatusCode code) + private HandshakeResponse createHandshakeResponse (HttpStatusCode code) { - var res = ResponseHandshake.CreateCloseResponse(code); - res.AddHeader("Sec-WebSocket-Version", _version); + var res = HandshakeResponse.CreateCloseResponse (code); + res.AddHeader ("Sec-WebSocket-Version", _version); return res; } - private string createResponseKey() + // As client + private string createRequestExtensions () { - var buffer = new StringBuilder(_base64key, 64); - buffer.Append(_guid); - SHA1 sha1 = new SHA1CryptoServiceProvider(); - var src = sha1.ComputeHash(Encoding.UTF8.GetBytes(buffer.ToString())); + var extensions = new StringBuilder (64); + var comp = createCompressionExtension (_compression); + if (comp.Length > 0) + extensions.Append (comp); - return Convert.ToBase64String(src); + return extensions.Length > 0 + ? extensions.ToString () + : String.Empty; + } + + private string createResponseKey () + { + var buffer = new StringBuilder (_base64key, 64); + buffer.Append (_guid); + SHA1 sha1 = new SHA1CryptoServiceProvider (); + var src = sha1.ComputeHash (Encoding.UTF8.GetBytes (buffer.ToString ())); + + return Convert.ToBase64String (src); } // As client private bool doHandshake () { setClientStream (); - return processResponseHandshake (sendHandshakeRequest ()); + return processHandshakeResponse (sendHandshakeRequest ()); } private void error(string message) @@ -866,14 +866,14 @@ namespace WebSocketSharp { } // As client - private bool isValidResponseHandshake(ResponseHandshake response) + private bool isValidHandshakeResponse (HandshakeResponse response) { return !response.IsWebSocketResponse ? false - : !response.ContainsHeader("Sec-WebSocket-Accept", createResponseKey()) + : !response.ContainsHeader ("Sec-WebSocket-Accept", createResponseKey ()) ? false - : !response.ContainsHeader("Sec-WebSocket-Version") || - response.ContainsHeader("Sec-WebSocket-Version", _version); + : !response.ContainsHeader ("Sec-WebSocket-Version") || + response.ContainsHeader ("Sec-WebSocket-Version", _version); } private void open() @@ -1112,26 +1112,26 @@ namespace WebSocketSharp { } // As client - private bool processResponseHandshake(ResponseHandshake response) + private bool processHandshakeResponse (HandshakeResponse response) { var msg = response.IsUnauthorized - ? String.Format("An HTTP {0} authorization is required.", response.AuthChallenge.Scheme) - : !isValidResponseHandshake(response) + ? String.Format ("An HTTP {0} authorization is required.", response.AuthChallenge.Scheme) + : !isValidHandshakeResponse (response) ? "Invalid response to this WebSocket connection request." : String.Empty; if (msg.Length > 0) { - _logger.Error(msg); - error(msg); - Close(CloseStatusCode.ABNORMAL, msg); + _logger.Error (msg); + error (msg); + Close (CloseStatusCode.ABNORMAL, msg); return false; } - processResponseProtocol(response.Headers["Sec-WebSocket-Protocol"]); - processResponseExtensions(response.Headers["Sec-WebSocket-Extensions"]); - processResponseCookies(response.Cookies); + processResponseProtocol (response.Headers ["Sec-WebSocket-Protocol"]); + processResponseExtensions (response.Headers ["Sec-WebSocket-Extensions"]); + processResponseCookies (response.Cookies); return true; } @@ -1144,10 +1144,10 @@ namespace WebSocketSharp { } // As client - private ResponseHandshake receiveResponseHandshake() + private HandshakeResponse receiveHandshakeResponse () { - var res = ResponseHandshake.Parse(_stream.ReadHandshake()); - _logger.Debug("Response handshake from server:\n" + res.ToString()); + var res = HandshakeResponse.Parse (_stream.ReadHandshake ()); + _logger.Debug ("A handshake response from the server:\n" + res.ToString ()); return res; } @@ -1160,9 +1160,9 @@ namespace WebSocketSharp { } // As server - private bool send (ResponseHandshake response) + private bool send (HandshakeResponse response) { - _logger.Debug ("Response handshake to client:\n" + response.ToString ()); + _logger.Debug ("A handshake response to a client:\n" + response.ToString ()); return _stream.WriteHandshake (response); } @@ -1301,7 +1301,7 @@ namespace WebSocketSharp { } // As client - private ResponseHandshake sendHandshakeRequest () + private HandshakeResponse sendHandshakeRequest () { var req = createHandshakeRequest (); var res = sendHandshakeRequest (req); @@ -1316,10 +1316,10 @@ namespace WebSocketSharp { } // As client - private ResponseHandshake sendHandshakeRequest (HandshakeRequest request) + private HandshakeResponse sendHandshakeRequest (HandshakeRequest request) { send (request); - return receiveResponseHandshake (); + return receiveHandshakeResponse (); } // As client @@ -1367,7 +1367,7 @@ namespace WebSocketSharp { internal void Close (HttpStatusCode code) { _readyState = WsState.CLOSING; - send (createResponseHandshake (code)); + send (createHandshakeResponse (code)); closeResources (); _readyState = WsState.CLOSED; } diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj index 5e9710a9..277d585c 100644 --- a/websocket-sharp/websocket-sharp.csproj +++ b/websocket-sharp/websocket-sharp.csproj @@ -72,7 +72,6 @@ - @@ -128,6 +127,7 @@ +