Fix due to the added QueryString property in WebSocketService.cs

websocket-sharp/Net/HttpListenerContext.cs

@@ -169,9 +169,9 @@ namespace WebSocketSharp.Net {
 
 		#region Public Method
 
-		public HttpListenerWebSocketContext AcceptWebSocket (string path)
+		public HttpListenerWebSocketContext AcceptWebSocket ()
 		{
-			return new HttpListenerWebSocketContext (path, this);
+			return new HttpListenerWebSocketContext (this);
 		}
 
 		#endregion

websocket-sharp/Net/HttpListenerWebSocketContext.cs

@@ -39,67 +39,113 @@ namespace WebSocketSharp.Net {
     private WebSocket           _socket;
     private WsStream            _stream;
 
-    internal HttpListenerWebSocketContext(string path, HttpListenerContext context)
+    internal HttpListenerWebSocketContext(HttpListenerContext context)
     {
       _context = context;
       _stream  = WsStream.CreateServerStream(context);
-      _socket  = new WebSocket(path.ToUri(), this);
+      _socket  = new WebSocket(this);
     }
 
     internal HttpListenerContext BaseContext {
-      get { return _context; }
+      get {
+        return _context;
+      }
     }
 
     internal WsStream Stream {
-      get { return _stream; }
+      get {
+        return _stream;
+      }
     }
 
     public override CookieCollection CookieCollection {
-      get { return _context.Request.Cookies; }
+      get {
+        return _context.Request.Cookies;
+      }
     }
 
     public override NameValueCollection Headers {
-      get { return _context.Request.Headers; }
+      get {
+        return _context.Request.Headers;
+      }
     }
 
     public override bool IsAuthenticated {
-      get { return _context.Request.IsAuthenticated; }
+      get {
+        return _context.Request.IsAuthenticated;
+      }
     }
 
     public override bool IsSecureConnection {
-      get { return _context.Request.IsSecureConnection; }
+      get {
+        return _context.Request.IsSecureConnection;
+      }
     }
 
     public override bool IsLocal {
-      get { return _context.Request.IsLocal; }
+      get {
+        return _context.Request.IsLocal;
+      }
     }
 
     public override string Origin {
-      get { return Headers["Origin"]; }
+      get {
+        return Headers["Origin"];
+      }
+    }
+
+    public virtual string Path {
+      get {
+        return RequestUri.GetAbsolutePath();
+      }
     }
 
     public override Uri RequestUri {
-      get { return _context.Request.RawUrl.ToUri(); }
+      get {
+        return _context.Request.RawUrl.ToUri();
+      }
     }
 
     public override string SecWebSocketKey {
-      get { return Headers["Sec-WebSocket-Key"]; }
+      get {
+        return Headers["Sec-WebSocket-Key"];
+      }
     }
 
     public override IEnumerable<string> SecWebSocketProtocols {
-      get { return Headers.GetValues("Sec-WebSocket-Protocol"); }
+      get {
+        return Headers.GetValues("Sec-WebSocket-Protocol");
+      }
     }
 
     public override string SecWebSocketVersion {
-      get { return Headers["Sec-WebSocket-Version"]; }
+      get {
+        return Headers["Sec-WebSocket-Version"];
+      }
+    }
+
+    public virtual System.Net.IPEndPoint ServerEndPoint {
+      get {
+        return _context.Connection.LocalEndPoint;
+      }
     }
 
     public override IPrincipal User {
-      get { return _context.User; }
+      get {
+        return _context.User;
+      }
+    }
+
+    public virtual System.Net.IPEndPoint UserEndPoint {
+      get {
+        return _context.Connection.RemoteEndPoint;
+      }
     }
 
     public override WebSocket WebSocket {
-      get { return _socket; }
+      get {
+        return _socket;
+      }
     }
   }
 }

websocket-sharp/Net/Sockets/TcpListenerWebSocketContext.cs

@@ -29,6 +29,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Net;
 using System.Net.Sockets;
 using System.Security.Principal;
 
@@ -44,72 +45,113 @@ namespace WebSocketSharp.Net.Sockets {
 
     internal TcpListenerWebSocketContext(TcpClient client)
     {
-      _client = client;
-      init();
-    }
-
-    internal TcpClient Client {
-      get { return _client; }
-    }
-
-    internal WsStream Stream {
-      get { return _stream; }
-    }
-
-    public override CookieCollection CookieCollection {
-      get { throw new NotImplementedException(); }
-    }
-
-    public override NameValueCollection Headers {
-      get { return _request.Headers; }
-    }
-
-    public override bool IsAuthenticated {
-      get { throw new NotImplementedException(); }
-    }
-
-    public override bool IsSecureConnection {
-      get { return _isSecure; }
-    }
-
-    public override bool IsLocal {
-      get { throw new NotImplementedException(); }
-    }
-
-    public override string Origin {
-      get { return Headers["Origin"]; }
-    }
-
-    public override Uri RequestUri {
-      get { return _request.RequestUri; }
-    }
-
-    public override string SecWebSocketKey {
-      get { return Headers["Sec-WebSocket-Key"]; }
-    }
-
-    public override IEnumerable<string> SecWebSocketProtocols {
-      get { return Headers.GetValues("Sec-WebSocket-Protocol"); }
-    }
-
-    public override string SecWebSocketVersion {
-      get { return Headers["Sec-WebSocket-Version"]; }
-    }
-
-    public override IPrincipal User {
-      get { throw new NotImplementedException(); }
-    }
-
-    public override WebSocket WebSocket {
-      get { return _socket; }
-    }
-
-    private void init()
-    {
-      _stream   = WsStream.CreateServerStream(_client);
+      _client   = client;
+      _stream   = WsStream.CreateServerStream(client);
       _isSecure = _stream.IsSecure;
       _request  = RequestHandshake.Parse(_stream.ReadHandshake());
       _socket   = new WebSocket(this);
     }
+
+    internal TcpClient Client {
+      get {
+        return _client;
+      }
+    }
+
+    internal WsStream Stream {
+      get {
+        return _stream;
+      }
+    }
+
+    public override CookieCollection CookieCollection {
+      get {
+        throw new NotImplementedException();
+      }
+    }
+
+    public override NameValueCollection Headers {
+      get {
+        return _request.Headers;
+      }
+    }
+
+    public override bool IsAuthenticated {
+      get {
+        throw new NotImplementedException();
+      }
+    }
+
+    public override bool IsSecureConnection {
+      get {
+        return _isSecure;
+      }
+    }
+
+    public override bool IsLocal {
+      get {
+        throw new NotImplementedException();
+      }
+    }
+
+    public override string Origin {
+      get {
+        return Headers["Origin"];
+      }
+    }
+
+    public virtual string Path {
+      get {
+        return _request.RequestUri.GetAbsolutePath();
+      }
+    }
+
+    public override Uri RequestUri {
+      get {
+        return _request.RequestUri;
+      }
+    }
+
+    public override string SecWebSocketKey {
+      get {
+        return Headers["Sec-WebSocket-Key"];
+      }
+    }
+
+    public override IEnumerable<string> SecWebSocketProtocols {
+      get {
+        return Headers.GetValues("Sec-WebSocket-Protocol");
+      }
+    }
+
+    public override string SecWebSocketVersion {
+      get {
+        return Headers["Sec-WebSocket-Version"];
+      }
+    }
+
+    public virtual IPEndPoint ServerEndPoint {
+      get {
+        return (IPEndPoint)_client.Client.LocalEndPoint;
+      }
+    }
+
+    public override IPrincipal User {
+      get {
+        throw new NotImplementedException();
+      }
+    }
+
+    public virtual IPEndPoint UserEndPoint {
+      get {
+        return (IPEndPoint)_client.Client.RemoteEndPoint;
+      }
+    }
+
+    public override WebSocket WebSocket {
+      get {
+        return _socket;
+      }
+    }
   }
 }