Removed WebSocketStream.cs

websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs

@@ -29,6 +29,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.IO;
 using System.Security.Principal;
 
 namespace WebSocketSharp.Net.WebSockets
@@ -37,8 +38,6 @@ namespace WebSocketSharp.Net.WebSockets
   /// Provides the properties used to access the information in a WebSocket connection request
   /// received by the <see cref="HttpListener"/>.
   /// </summary>
-  /// <remarks>
-  /// </remarks>
   public class HttpListenerWebSocketContext : WebSocketContext
   {
     #region Private Fields
@@ -61,9 +60,9 @@ namespace WebSocketSharp.Net.WebSockets
 
     #region Internal Properties
 
-    internal WebSocketStream Stream {
+    internal Stream Stream {
       get {
-        return _context.Connection.GetWebSocketStream ();
+        return _context.Connection.Stream;
       }
     }
 
@@ -103,7 +102,7 @@ namespace WebSocketSharp.Net.WebSockets
     /// </value>
     public override string Host {
       get {
-        return _context.Request.Headers ["Host"];
+        return _context.Request.Headers["Host"];
       }
     }
 
@@ -163,7 +162,7 @@ namespace WebSocketSharp.Net.WebSockets
     /// </value>
     public override string Origin {
       get {
-        return _context.Request.Headers ["Origin"];
+        return _context.Request.Headers["Origin"];
       }
     }
 
@@ -203,7 +202,7 @@ namespace WebSocketSharp.Net.WebSockets
     /// </value>
     public override string SecWebSocketKey {
       get {
-        return _context.Request.Headers ["Sec-WebSocket-Key"];
+        return _context.Request.Headers["Sec-WebSocket-Key"];
       }
     }
 
@@ -220,7 +219,7 @@ namespace WebSocketSharp.Net.WebSockets
     /// </value>
     public override IEnumerable<string> SecWebSocketProtocols {
       get {
-        var protocols = _context.Request.Headers ["Sec-WebSocket-Protocol"];
+        var protocols = _context.Request.Headers["Sec-WebSocket-Protocol"];
         if (protocols != null)
           foreach (var protocol in protocols.Split (','))
             yield return protocol.Trim ();
@@ -238,7 +237,7 @@ namespace WebSocketSharp.Net.WebSockets
     /// </value>
     public override string SecWebSocketVersion {
       get {
-        return _context.Request.Headers ["Sec-WebSocket-Version"];
+        return _context.Request.Headers["Sec-WebSocket-Version"];
       }
     }
 

websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs

@@ -29,6 +29,8 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.IO;
+using System.Net.Security;
 using System.Net.Sockets;
 using System.Security.Cryptography.X509Certificates;
 using System.Security.Principal;
@@ -48,7 +50,7 @@ namespace WebSocketSharp.Net.WebSockets
     private NameValueCollection _queryString;
     private HttpRequest         _request;
     private bool                _secure;
-    private WebSocketStream     _stream;
+    private Stream              _stream;
     private TcpClient           _tcpClient;
     private Uri                 _uri;
     private IPrincipal          _user;
@@ -63,8 +65,18 @@ namespace WebSocketSharp.Net.WebSockets
     {
       _tcpClient = tcpClient;
       _secure = secure;
-      _stream = WebSocketStream.CreateServerStream (tcpClient, secure, certificate);
-      _request = _stream.ReadHttpRequest (90000);
+
+      var netStream = tcpClient.GetStream ();
+      if (secure) {
+        var sslStream = new SslStream (netStream, false);
+        sslStream.AuthenticateAsServer (certificate);
+        _stream = sslStream;
+      }
+      else {
+        _stream = netStream;
+      }
+
+      _request = HttpRequest.Read (_stream, 90000);
       _uri = HttpUtility.CreateRequestUrl (
         _request.RequestUri, _request.Headers["Host"], _request.IsWebSocketRequest, secure);
 
@@ -75,7 +87,7 @@ namespace WebSocketSharp.Net.WebSockets
 
     #region Internal Properties
 
-    internal WebSocketStream Stream {
+    internal Stream Stream {
       get {
         return _stream;
       }
@@ -324,8 +336,9 @@ namespace WebSocketSharp.Net.WebSockets
 
     internal void SendAuthenticationChallenge (string challenge)
     {
-      _stream.WriteBytes (HttpResponse.CreateUnauthorizedResponse (challenge).ToByteArray ());
-      _request = _stream.ReadHttpRequest (15000);
+      var buff = HttpResponse.CreateUnauthorizedResponse (challenge).ToByteArray ();
+      _stream.Write (buff, 0, buff.Length);
+      _request = HttpRequest.Read (_stream, 15000);
     }
 
     internal void SetUser (