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

Modified opening and closing handshake

Browse Source
This commit is contained in:
sta
2013-08-06 21:31:21 +09:00
parent 7deddda2f9
commit 69c9be3eb5
9 changed files with 514 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,10 +31,10 @@ using System.Collections.Generic;
using System.Collections.Specialized;
using System.Security.Principal;
namespace WebSocketSharp.Net.WebSockets {
namespace WebSocketSharp.Net.WebSockets
{
/// <summary>
/// Provides access to the WebSocket connection request objects received by the <see cref="HttpListener"/> class.
/// Provides access to the WebSocket connection request objects received by the <see cref="HttpListener"/>.
/// </summary>
/// <remarks>
/// </remarks>
@@ -44,17 +44,17 @@ namespace WebSocketSharp.Net.WebSockets {
private HttpListenerContext _context;
private WebSocket _websocket;
private WsStream _wsStream;
private WsStream _stream;
#endregion
#region Internal Constructors
internal HttpListenerWebSocketContext(HttpListenerContext context)
internal HttpListenerWebSocketContext (HttpListenerContext context)
{
_context = context;
_wsStream = WsStream.CreateServerStream(context);
_websocket = new WebSocket(this);
_context = context;
_stream = WsStream.CreateServerStream (context);
_websocket = new WebSocket (this);
}
#endregion
@@ -63,7 +63,7 @@ namespace WebSocketSharp.Net.WebSockets {
internal WsStream Stream {
get {
return _wsStream;
return _stream;
}
}
@@ -95,6 +95,18 @@ namespace WebSocketSharp.Net.WebSockets {
}
}
/// <summary>
/// Gets the value of the Host header field used in the WebSocket opening handshake.
/// </summary>
/// <value>
/// A <see cref="string"/> that contains the value of the Host header field.
/// </value>
public override string Host {
get {
return _context.Request.Headers ["Host"];
}
}
/// <summary>
/// Gets a value indicating whether the client is authenticated.
/// </summary>
@@ -132,18 +144,14 @@ namespace WebSocketSharp.Net.WebSockets {
}
/// <summary>
/// Gets a value indicating whether the WebSocket connection request is valid.
/// Gets a value indicating whether the request is a WebSocket connection request.
/// </summary>
/// <value>
/// <c>true</c> if the WebSocket connection request is valid; otherwise, <c>false</c>.
/// <c>true</c> if the request is a WebSocket connection request; otherwise, <c>false</c>.
/// </value>
public override bool IsValid {
public override bool IsWebSocketRequest {
get {
return !_context.Request.IsWebSocketRequest
? false
: SecWebSocketKey.IsNullOrEmpty()
? false
: !SecWebSocketVersion.IsNullOrEmpty();
return _context.Request.IsWebSocketRequest;
}
}
@@ -155,7 +163,7 @@ namespace WebSocketSharp.Net.WebSockets {
/// </value>
public override string Origin {
get {
return Headers["Origin"];
return _context.Request.Headers ["Origin"];
}
}
@@ -167,7 +175,7 @@ namespace WebSocketSharp.Net.WebSockets {
/// </value>
public override string Path {
get {
return RequestUri.GetAbsolutePath();
return RequestUri.GetAbsolutePath ();
}
}
@@ -191,7 +199,7 @@ namespace WebSocketSharp.Net.WebSockets {
/// </value>
public override Uri RequestUri {
get {
return _context.Request.RawUrl.ToUri();
return _context.Request.RawUrl.ToUri ();
}
}
@@ -206,7 +214,7 @@ namespace WebSocketSharp.Net.WebSockets {
/// </value>
public override string SecWebSocketKey {
get {
return Headers["Sec-WebSocket-Key"];
return _context.Request.Headers ["Sec-WebSocket-Key"];
}
}
@@ -221,7 +229,7 @@ namespace WebSocketSharp.Net.WebSockets {
/// </value>
public override IEnumerable<string> SecWebSocketProtocols {
get {
return Headers.GetValues("Sec-WebSocket-Protocol");
return _context.Request.Headers.GetValues ("Sec-WebSocket-Protocol");
}
}
@@ -236,7 +244,7 @@ namespace WebSocketSharp.Net.WebSockets {
/// </value>
public override string SecWebSocketVersion {
get {
return Headers["Sec-WebSocket-Version"];
return _context.Request.Headers ["Sec-WebSocket-Version"];
}
}
@@ -246,7 +254,7 @@ namespace WebSocketSharp.Net.WebSockets {
/// <value>
/// A <see cref="System.Net.IPEndPoint"/> that contains the server endpoint.
/// </value>
public virtual System.Net.IPEndPoint ServerEndPoint {
public override System.Net.IPEndPoint ServerEndPoint {
get {
return _context.Connection.LocalEndPoint;
}
@@ -270,7 +278,7 @@ namespace WebSocketSharp.Net.WebSockets {
/// <value>
/// A <see cref="System.Net.IPEndPoint"/> that contains the client endpoint.
/// </value>
public virtual System.Net.IPEndPoint UserEndPoint {
public override System.Net.IPEndPoint UserEndPoint {
get {
return _context.Connection.RemoteEndPoint;
}
@@ -292,9 +300,24 @@ namespace WebSocketSharp.Net.WebSockets {
#region Internal Methods
internal void Close()
internal void Close ()
{
_context.Connection.Close(true);
_context.Connection.Close (true);
}
#endregion
#region Public Methods
/// <summary>
/// Returns a <see cref="string"/> that represents the current <see cref="HttpListenerWebSocketContext"/>.
/// </summary>
/// <returns>
/// A <see cref="string"/> that represents the current <see cref="HttpListenerWebSocketContext"/>.
/// </returns>
public override string ToString ()
{
return _context.Request.ToString ();
}
#endregion

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

@@ -105,6 +105,18 @@ namespace WebSocketSharp.Net.WebSockets
}
}
/// <summary>
/// Gets the value of the Host header field used in the WebSocket opening handshake.
/// </summary>
/// <value>
/// A <see cref="string"/> that contains the value of the Host header field.
/// </value>
public override string Host {
get {
return _request.Headers ["Host"];
}
}
/// <summary>
/// Gets a value indicating whether the client is authenticated.
/// </summary>
@@ -145,18 +157,14 @@ namespace WebSocketSharp.Net.WebSockets
}
/// <summary>
/// Gets a value indicating whether the WebSocket connection request is valid.
/// Gets a value indicating whether the request is a WebSocket connection request.
/// </summary>
/// <value>
/// <c>true</c> if the WebSocket connection request is valid; otherwise, <c>false</c>.
/// <c>true</c> if the request is a WebSocket connection request; otherwise, <c>false</c>.
/// </value>
public override bool IsValid {
public override bool IsWebSocketRequest {
get {
return !_request.IsWebSocketRequest
? false
: SecWebSocketKey.IsNullOrEmpty ()
? false
: !SecWebSocketVersion.IsNullOrEmpty ();
return _request.IsWebSocketRequest;
}
}
@@ -168,7 +176,7 @@ namespace WebSocketSharp.Net.WebSockets
/// </value>
public override string Origin {
get {
return Headers ["Origin"];
return _request.Headers ["Origin"];
}
}
@@ -219,7 +227,7 @@ namespace WebSocketSharp.Net.WebSockets
/// </value>
public override string SecWebSocketKey {
get {
return Headers ["Sec-WebSocket-Key"];
return _request.Headers ["Sec-WebSocket-Key"];
}
}
@@ -227,14 +235,14 @@ namespace WebSocketSharp.Net.WebSockets
/// Gets the values of the Sec-WebSocket-Protocol header field used in the WebSocket opening handshake.
/// </summary>
/// <remarks>
/// The SecWebSocketProtocols property indicates the subprotocols of the WebSocket connection.
/// This property indicates the subprotocols of the WebSocket connection.
/// </remarks>
/// <value>
/// An IEnumerable&lt;string&gt; that contains the values of the Sec-WebSocket-Protocol header field.
/// </value>
public override IEnumerable<string> SecWebSocketProtocols {
get {
return Headers.GetValues ("Sec-WebSocket-Protocol");
return _request.Headers.GetValues ("Sec-WebSocket-Protocol");
}
}
@@ -249,7 +257,7 @@ namespace WebSocketSharp.Net.WebSockets
/// </value>
public override string SecWebSocketVersion {
get {
return Headers ["Sec-WebSocket-Version"];
return _request.Headers ["Sec-WebSocket-Version"];
}
}
@@ -259,7 +267,7 @@ namespace WebSocketSharp.Net.WebSockets
/// <value>
/// A <see cref="System.Net.IPEndPoint"/> that contains the server endpoint.
/// </value>
public virtual System.Net.IPEndPoint ServerEndPoint {
public override System.Net.IPEndPoint ServerEndPoint {
get {
return (System.Net.IPEndPoint) _client.Client.LocalEndPoint;
}
@@ -286,7 +294,7 @@ namespace WebSocketSharp.Net.WebSockets
/// <value>
/// A <see cref="System.Net.IPEndPoint"/> that contains the client endpoint.
/// </value>
public virtual System.Net.IPEndPoint UserEndPoint {
public override System.Net.IPEndPoint UserEndPoint {
get {
return (System.Net.IPEndPoint) _client.Client.RemoteEndPoint;
}
@@ -315,5 +323,20 @@ namespace WebSocketSharp.Net.WebSockets
}
#endregion
#region Public Methods
/// <summary>
/// Returns a <see cref="string"/> that represents the current <see cref="TcpListenerWebSocketContext"/>.
/// </summary>
/// <returns>
/// A <see cref="string"/> that represents the current <see cref="TcpListenerWebSocketContext"/>.
/// </returns>
public override string ToString ()
{
return _request.ToString ();
}
#endregion
}
}

40
websocket-sharp/Net/WebSockets/WebSocketContext.cs
View File

@@ -31,22 +31,22 @@ using System.Collections.Generic;
using System.Collections.Specialized;
using System.Security.Principal;
namespace WebSocketSharp.Net.WebSockets {
namespace WebSocketSharp.Net.WebSockets
{
/// <summary>
/// Provides access to the WebSocket connection request objects.
/// </summary>
/// <remarks>
/// The WebSocketContext class is an abstract class.
/// </remarks>
public abstract class WebSocketContext {
public abstract class WebSocketContext
{
#region Protected Constructors
/// <summary>
/// Initializes a new instance of the <see cref="WebSocketSharp.Net.WebSockets.WebSocketContext"/> class.
/// </summary>
protected WebSocketContext()
protected WebSocketContext ()
{
}
@@ -70,6 +70,14 @@ namespace WebSocketSharp.Net.WebSockets {
/// </value>
public abstract NameValueCollection Headers { get; }
/// <summary>
/// Gets the value of the Host header field used in the WebSocket opening handshake.
/// </summary>
/// <value>
/// A <see cref="string"/> that contains the value of the Host header field.
/// </value>
public abstract string Host { get; }
/// <summary>
/// Gets a value indicating whether the client is authenticated.
/// </summary>
@@ -95,12 +103,12 @@ namespace WebSocketSharp.Net.WebSockets {
public abstract bool IsSecureConnection { get; }
/// <summary>
/// Gets a value indicating whether the WebSocket connection request is valid.
/// Gets a value indicating whether the request is a WebSocket connection request.
/// </summary>
/// <value>
/// <c>true</c> if the WebSocket connection request is valid; otherwise, <c>false</c>.
/// <c>true</c> if the request is a WebSocket connection request; otherwise, <c>false</c>.
/// </value>
public abstract bool IsValid { get; }
public abstract bool IsWebSocketRequest { get; }
/// <summary>
/// Gets the value of the Origin header field used in the WebSocket opening handshake.
@@ -167,6 +175,14 @@ namespace WebSocketSharp.Net.WebSockets {
/// </value>
public abstract string SecWebSocketVersion { get; }
/// <summary>
/// Gets the server endpoint as an IP address and a port number.
/// </summary>
/// <value>
/// A <see cref="System.Net.IPEndPoint"/> that contains the server endpoint.
/// </value>
public abstract System.Net.IPEndPoint ServerEndPoint { get; }
/// <summary>
/// Gets the client information (identity, authentication information and security roles).
/// </summary>
@@ -175,6 +191,14 @@ namespace WebSocketSharp.Net.WebSockets {
/// </value>
public abstract IPrincipal User { get; }
/// <summary>
/// Gets the client endpoint as an IP address and a port number.
/// </summary>
/// <value>
/// A <see cref="System.Net.IPEndPoint"/> that contains the client endpoint.
/// </value>
public abstract System.Net.IPEndPoint UserEndPoint { get; }
/// <summary>
/// Gets the WebSocket instance used for two-way communication between client and server.
/// </summary>