From fdf413545e444f20e26a55117d542b2f374d88ef Mon Sep 17 00:00:00 2001 From: sta Date: Wed, 14 May 2014 13:08:15 +0900 Subject: [PATCH] Renamed WsStream.cs to WebSocketStream.cs --- .../HttpListenerWebSocketContext.cs | 6 ++--- .../WebSockets/TcpListenerWebSocketContext.cs | 6 ++--- websocket-sharp/WebSocket.cs | 5 ++-- .../{WsStream.cs => WebSocketStream.cs} | 26 +++++++++---------- websocket-sharp/websocket-sharp.csproj | 2 +- 5 files changed, 23 insertions(+), 22 deletions(-) rename websocket-sharp/{WsStream.cs => WebSocketStream.cs} (90%) diff --git a/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs index f1c2c2ff..a62ea0de 100644 --- a/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs +++ b/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs @@ -44,7 +44,7 @@ namespace WebSocketSharp.Net.WebSockets #region Private Fields private HttpListenerContext _context; - private WsStream _stream; + private WebSocketStream _stream; private WebSocket _websocket; #endregion @@ -55,7 +55,7 @@ namespace WebSocketSharp.Net.WebSockets HttpListenerContext context, string protocol, Logger logger) { _context = context; - _stream = WsStream.CreateServerStream (context); + _stream = WebSocketStream.CreateServerStream (context); _websocket = new WebSocket (this, protocol, logger); } @@ -63,7 +63,7 @@ namespace WebSocketSharp.Net.WebSockets #region Internal Properties - internal WsStream Stream { + internal WebSocketStream Stream { get { return _stream; } diff --git a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs index 6e06b499..c9ec8338 100644 --- a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs +++ b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs @@ -49,7 +49,7 @@ namespace WebSocketSharp.Net.WebSockets private CookieCollection _cookies; private HandshakeRequest _request; private bool _secure; - private WsStream _stream; + private WebSocketStream _stream; private Uri _uri; private IPrincipal _user; private WebSocket _websocket; @@ -63,7 +63,7 @@ namespace WebSocketSharp.Net.WebSockets { _client = client; _secure = secure; - _stream = WsStream.CreateServerStream (client, secure, cert); + _stream = WebSocketStream.CreateServerStream (client, secure, cert); _request = _stream.ReadHandshake (HandshakeRequest.Parse, 90000); _websocket = new WebSocket (this, protocol, logger); } @@ -72,7 +72,7 @@ namespace WebSocketSharp.Net.WebSockets #region Internal Properties - internal WsStream Stream { + internal WebSocketStream Stream { get { return _stream; } diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index da34a715..3d4192a7 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -91,7 +91,7 @@ namespace WebSocketSharp private volatile WebSocketState _readyState; private AutoResetEvent _receivePong; private bool _secure; - private WsStream _stream; + private WebSocketStream _stream; private TcpClient _tcpClient; private Uri _uri; @@ -1242,7 +1242,8 @@ namespace WebSocketSharp var port = _uri.Port; _tcpClient = new TcpClient (host, port); - _stream = WsStream.CreateClientStream (_tcpClient, _secure, host, _certValidationCallback); + _stream = WebSocketStream.CreateClientStream ( + _tcpClient, _secure, host, _certValidationCallback); } private void startReceiving () diff --git a/websocket-sharp/WsStream.cs b/websocket-sharp/WebSocketStream.cs similarity index 90% rename from websocket-sharp/WsStream.cs rename to websocket-sharp/WebSocketStream.cs index 1e8c746f..f09334e0 100644 --- a/websocket-sharp/WsStream.cs +++ b/websocket-sharp/WebSocketStream.cs @@ -1,6 +1,6 @@ #region License /* - * WsStream.cs + * WebSocketStream.cs * * The MIT License * @@ -38,7 +38,7 @@ using WebSocketSharp.Net.Security; namespace WebSocketSharp { - internal class WsStream : IDisposable + internal class WebSocketStream : IDisposable { #region Private Const Fields @@ -56,7 +56,7 @@ namespace WebSocketSharp #region Internal Constructors - internal WsStream (Stream innerStream, bool secure) + internal WebSocketStream (Stream innerStream, bool secure) { _innerStream = innerStream; _secure = secure; @@ -67,12 +67,12 @@ namespace WebSocketSharp #region Public Constructors - public WsStream (NetworkStream innerStream) + public WebSocketStream (NetworkStream innerStream) : this (innerStream, false) { } - public WsStream (SslStream innerStream) + public WebSocketStream (SslStream innerStream) : this (innerStream, true) { } @@ -205,7 +205,7 @@ namespace WebSocketSharp _innerStream.Close (); } - public static WsStream CreateClientStream ( + public static WebSocketStream CreateClientStream ( TcpClient client, bool secure, string host, @@ -219,13 +219,13 @@ namespace WebSocketSharp var sslStream = new SslStream (netStream, false, validationCallback); sslStream.AuthenticateAsClient (host); - return new WsStream (sslStream); + return new WebSocketStream (sslStream); } - return new WsStream (netStream); + return new WebSocketStream (netStream); } - public static WsStream CreateServerStream ( + public static WebSocketStream CreateServerStream ( TcpClient client, bool secure, X509Certificate cert) { var netStream = client.GetStream (); @@ -233,16 +233,16 @@ namespace WebSocketSharp var sslStream = new SslStream (netStream, false); sslStream.AuthenticateAsServer (cert); - return new WsStream (sslStream); + return new WebSocketStream (sslStream); } - return new WsStream (netStream); + return new WebSocketStream (netStream); } - public static WsStream CreateServerStream (HttpListenerContext context) + public static WebSocketStream CreateServerStream (HttpListenerContext context) { var conn = context.Connection; - return new WsStream (conn.Stream, conn.IsSecure); + return new WebSocketStream (conn.Stream, conn.IsSecure); } public void Dispose () diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj index 03a55d63..4819ec02 100644 --- a/websocket-sharp/websocket-sharp.csproj +++ b/websocket-sharp/websocket-sharp.csproj @@ -70,7 +70,6 @@ - @@ -131,6 +130,7 @@ +