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

Renamed WsStream.cs to WebSocketStream.cs

Browse Source
This commit is contained in:
sta 2014-05-14 13:08:15 +09:00
parent 4611ed7a8d
commit fdf413545e
5 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs
View File

@ -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;
}

6
websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
View File

@ -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> (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;
}

5
websocket-sharp/WebSocket.cs
View File

@ -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 ()

26
websocket-sharp/WsStream.cs → websocket-sharp/WebSocketStream.cs
View File

@ -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 ()

2
websocket-sharp/websocket-sharp.csproj
View File

@ -70,7 +70,6 @@
<Compile Include="WebSocket.cs" />
<Compile Include="Server\WebSocketServer.cs" />
<Compile Include="Server\WebSocketService.cs" />
<Compile Include="WsStream.cs" />
<Compile Include="Net\AuthenticationSchemes.cs" />
<Compile Include="Net\ChunkStream.cs" />
<Compile Include="Net\ChunkedInputStream.cs" />
@ -131,6 +130,7 @@
<Compile Include="Server\WebSocketServiceManager.cs" />
<Compile Include="Net\InputState.cs" />
<Compile Include="Net\LineState.cs" />
<Compile Include="WebSocketStream.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>