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

Added Log property to the TcpListenerWebSocketContext class

Browse Source
This commit is contained in:
sta 2015-02-11 18:00:17 +09:00
parent 14c419fc17
commit e989e3e18f
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,7 @@ namespace WebSocketSharp.Net.WebSockets
#region Private Fields
private CookieCollection _cookies;
private Logger _logger;
private NameValueCollection _queryString;
private HttpRequest _request;
private bool _secure;
@ -76,6 +77,7 @@ namespace WebSocketSharp.Net.WebSockets
{
_tcpClient = tcpClient;
_secure = secure;
_logger = logger;
var netStream = tcpClient.GetStream ();
if (secure) {
@ -98,7 +100,7 @@ namespace WebSocketSharp.Net.WebSockets
_uri = HttpUtility.CreateRequestUrl (
_request.RequestUri, _request.Headers["Host"], _request.IsWebSocketRequest, secure);
_websocket = new WebSocket (this, protocol, logger);
_websocket = new WebSocket (this, protocol);
}
#endregion
@ -111,6 +113,12 @@ namespace WebSocketSharp.Net.WebSockets
}
}
internal Logger Log {
get {
return _logger;
}
}
internal Stream Stream {
get {
return _stream;

4
websocket-sharp/WebSocket.cs
View File

@ -131,13 +131,13 @@ namespace WebSocketSharp
}
// As server
internal WebSocket (TcpListenerWebSocketContext context, string protocol, Logger logger)
internal WebSocket (TcpListenerWebSocketContext context, string protocol)
{
_context = context;
_protocol = protocol;
_logger = logger;
_closeContext = context.Close;
_logger = context.Log;
_secure = context.IsSecureConnection;
_stream = context.Stream;
_waitTime = TimeSpan.FromSeconds (1);