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

Refactored HttpServer.cs, WebSocketServer.cs

Browse Source
This commit is contained in:
sta 2014-02-16 17:23:51 +09:00
parent 35b1eef124
commit 9ee09919b1
2 changed files with 122 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

257
websocket-sharp/Server/HttpServer.cs
View File

@ -48,8 +48,7 @@ using WebSocketSharp.Net.WebSockets;
namespace WebSocketSharp.Server namespace WebSocketSharp.Server
{ {
/// <summary> /// <summary>
/// Provides a simple HTTP server that allows to accept the WebSocket /// Provides a simple HTTP server that allows to accept the WebSocket connection requests.
/// connection requests.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// The HttpServer class can provide the multi WebSocket services. /// The HttpServer class can provide the multi WebSocket services.
@ -58,16 +57,16 @@ namespace WebSocketSharp.Server
{ {
#region Private Fields #region Private Fields
private HttpListener _listener; private HttpListener _listener;
private Logger _logger; private Logger _logger;
private int _port; private int _port;
private Thread _receiveRequestThread; private Thread _receiveRequestThread;
private string _rootPath; private string _rootPath;
private bool _secure; private bool _secure;
private WebSocketServiceManager _services; private WebSocketServiceManager _services;
private volatile ServerState _state; private volatile ServerState _state;
private object _sync; private object _sync;
private bool _windows; private bool _windows;
#endregion #endregion
@ -77,8 +76,7 @@ namespace WebSocketSharp.Server
/// Initializes a new instance of the <see cref="HttpServer"/> class. /// Initializes a new instance of the <see cref="HttpServer"/> class.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// An instance initialized by this constructor listens for the incoming /// An instance initialized by this constructor listens for the incoming requests on port 80.
/// requests on port 80.
/// </remarks> /// </remarks>
public HttpServer () public HttpServer ()
: this (80) : this (80)
@ -86,17 +84,16 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="HttpServer"/> class with /// Initializes a new instance of the <see cref="HttpServer"/> class with the specified
/// the specified <paramref name="port"/>. /// <paramref name="port"/>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// <para> /// <para>
/// An instance initialized by this constructor listens for the incoming /// An instance initialized by this constructor listens for the incoming requests on
/// requests on <paramref name="port"/>. /// <paramref name="port"/>.
/// </para> /// </para>
/// <para> /// <para>
/// And if <paramref name="port"/> is 443, that instance provides a secure /// And if <paramref name="port"/> is 443, that instance provides a secure connection.
/// connection.
/// </para> /// </para>
/// </remarks> /// </remarks>
/// <param name="port"> /// <param name="port">
@ -106,24 +103,24 @@ namespace WebSocketSharp.Server
/// <paramref name="port"/> isn't between 1 and 65535. /// <paramref name="port"/> isn't between 1 and 65535.
/// </exception> /// </exception>
public HttpServer (int port) public HttpServer (int port)
: this (port, port == 443 ? true : false) : this (port, port == 443)
{ {
} }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="HttpServer"/> class with /// Initializes a new instance of the <see cref="HttpServer"/> class with the specified
/// the specified <paramref name="port"/> and <paramref name="secure"/>. /// <paramref name="port"/> and <paramref name="secure"/>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// An instance initialized by this constructor listens for the incoming /// An instance initialized by this constructor listens for the incoming requests on
/// requests on <paramref name="port"/>. /// <paramref name="port"/>.
/// </remarks> /// </remarks>
/// <param name="port"> /// <param name="port">
/// An <see cref="int"/> that represents the port number on which to listen. /// An <see cref="int"/> that represents the port number on which to listen.
/// </param> /// </param>
/// <param name="secure"> /// <param name="secure">
/// A <see cref="bool"/> that indicates providing a secure connection or not. /// A <see cref="bool"/> that indicates providing a secure connection or not. (<c>true</c>
/// (<c>true</c> indicates providing a secure connection.) /// indicates providing a secure connection.)
/// </param> /// </param>
/// <exception cref="ArgumentOutOfRangeException"> /// <exception cref="ArgumentOutOfRangeException">
/// <paramref name="port"/> isn't between 1 and 65535. /// <paramref name="port"/> isn't between 1 and 65535.
@ -134,13 +131,11 @@ namespace WebSocketSharp.Server
public HttpServer (int port, bool secure) public HttpServer (int port, bool secure)
{ {
if (!port.IsPortNumber ()) if (!port.IsPortNumber ())
throw new ArgumentOutOfRangeException ( throw new ArgumentOutOfRangeException ("port", "Must be between 1 and 65535: " + port);
"port", "Must be between 1 and 65535: " + port);
if ((port == 80 && secure) || (port == 443 && !secure)) if ((port == 80 && secure) || (port == 443 && !secure))
throw new ArgumentException ( throw new ArgumentException (
String.Format ( String.Format ("Invalid pair of 'port' and 'secure': {0}, {1}", port, secure));
"Invalid pair of 'port' and 'secure': {0}, {1}", port, secure));
_port = port; _port = port;
_secure = secure; _secure = secure;
@ -166,9 +161,9 @@ namespace WebSocketSharp.Server
/// Gets or sets the scheme used to authenticate the clients. /// Gets or sets the scheme used to authenticate the clients.
/// </summary> /// </summary>
/// <value> /// <value>
/// One of the <see cref="WebSocketSharp.Net.AuthenticationSchemes"/> enum /// One of the <see cref="WebSocketSharp.Net.AuthenticationSchemes"/> enum values, indicates
/// values, indicates the scheme used to authenticate the clients. The default /// the scheme used to authenticate the clients.
/// value is <see cref="WebSocketSharp.Net.AuthenticationSchemes.Anonymous"/>. /// The default value is <see cref="WebSocketSharp.Net.AuthenticationSchemes.Anonymous"/>.
/// </value> /// </value>
public AuthenticationSchemes AuthenticationSchemes { public AuthenticationSchemes AuthenticationSchemes {
get { get {
@ -184,8 +179,7 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets or sets the certificate used to authenticate the server on the /// Gets or sets the certificate used to authenticate the server on the secure connection.
/// secure connection.
/// </summary> /// </summary>
/// <value> /// <value>
/// A <see cref="X509Certificate2"/> used to authenticate the server. /// A <see cref="X509Certificate2"/> used to authenticate the server.
@ -200,8 +194,7 @@ namespace WebSocketSharp.Server
return; return;
if (EndPointListener.CertificateExists (_port, _listener.CertificateFolderPath)) if (EndPointListener.CertificateExists (_port, _listener.CertificateFolderPath))
_logger.Warn ( _logger.Warn ("The server certificate associated with the port number already exists.");
"The server certificate associated with the port number already exists.");
_listener.DefaultCertificate = value; _listener.DefaultCertificate = value;
} }
@ -223,8 +216,7 @@ namespace WebSocketSharp.Server
/// Gets a value indicating whether the server provides a secure connection. /// Gets a value indicating whether the server provides a secure connection.
/// </summary> /// </summary>
/// <value> /// <value>
/// <c>true</c> if the server provides a secure connection; otherwise, /// <c>true</c> if the server provides a secure connection; otherwise, <c>false</c>.
/// <c>false</c>.
/// </value> /// </value>
public bool IsSecure { public bool IsSecure {
get { get {
@ -233,12 +225,12 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether the server cleans up the inactive /// Gets or sets a value indicating whether the server cleans up the inactive sessions in the
/// WebSocket sessions periodically. /// WebSocket services periodically.
/// </summary> /// </summary>
/// <value> /// <value>
/// <c>true</c> if the server cleans up the inactive WebSocket sessions every /// <c>true</c> if the server cleans up the inactive sessions every 60 seconds; otherwise,
/// 60 seconds; otherwise, <c>false</c>. The default value is <c>true</c>. /// <c>false</c>. The default value is <c>true</c>.
/// </value> /// </value>
public bool KeepClean { public bool KeepClean {
get { get {
@ -254,9 +246,9 @@ namespace WebSocketSharp.Server
/// Gets the logging functions. /// Gets the logging functions.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// The default logging level is <see cref="LogLevel.ERROR"/>. If you would /// The default logging level is <see cref="LogLevel.ERROR"/>. If you would like to change it,
/// like to change it, you should set the <c>Log.Level</c> property to any of /// you should set the <c>Log.Level</c> property to any of the <see cref="LogLevel"/> enum
/// the <see cref="LogLevel"/> enum values. /// values.
/// </remarks> /// </remarks>
/// <value> /// <value>
/// A <see cref="Logger"/> that provides the logging functions. /// A <see cref="Logger"/> that provides the logging functions.
@ -280,12 +272,11 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets or sets the name of the realm associated with the /// Gets or sets the name of the realm associated with the server.
/// <see cref="HttpServer"/>.
/// </summary> /// </summary>
/// <value> /// <value>
/// A <see cref="string"/> that represents the name of the realm. /// A <see cref="string"/> that represents the name of the realm. The default value is
/// The default value is <c>SECRET AREA</c>. /// <c>SECRET AREA</c>.
/// </value> /// </value>
public string Realm { public string Realm {
get { get {
@ -301,11 +292,11 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets or sets the document root path of server. /// Gets or sets the document root path of the server.
/// </summary> /// </summary>
/// <value> /// <value>
/// A <see cref="string"/> that represents the document root path of server. /// A <see cref="string"/> that represents the document root path of the server. The default
/// The default value is <c>./Public</c>. /// value is <c>./Public</c>.
/// </value> /// </value>
public string RootPath { public string RootPath {
get { get {
@ -323,13 +314,13 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets or sets the delegate called to find the credentials for an identity /// Gets or sets the delegate called to find the credentials for an identity used to
/// used to authenticate a client. /// authenticate a client.
/// </summary> /// </summary>
/// <value> /// <value>
/// A Func&lt;<see cref="IIdentity"/>, <see cref="NetworkCredential"/>&gt; /// A Func&lt;<see cref="IIdentity"/>, <see cref="NetworkCredential"/>&gt; delegate that
/// delegate that references the method(s) used to find the credentials. /// references the method(s) used to find the credentials. The default value is a function
/// The default value is a function that only returns <see langword="null"/>. /// that only returns <see langword="null"/>.
/// </value> /// </value>
public Func<IIdentity, NetworkCredential> UserCredentialsFinder { public Func<IIdentity, NetworkCredential> UserCredentialsFinder {
get { get {
@ -345,7 +336,7 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets the access to the WebSocket services provided by the <see cref="HttpServer"/>. /// Gets the access to the WebSocket services provided by the server.
/// </summary> /// </summary>
/// <value> /// <value>
/// A <see cref="WebSocketServiceManager"/> that manages the WebSocket services. /// A <see cref="WebSocketServiceManager"/> that manages the WebSocket services.
@ -419,10 +410,9 @@ namespace WebSocketSharp.Server
} }
_services.Stop ( _services.Stop (
((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG), ((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG), true);
true);
_listener.Abort ();
_listener.Abort ();
_state = ServerState.STOP; _state = ServerState.STOP;
} }
@ -430,7 +420,6 @@ namespace WebSocketSharp.Server
{ {
var args = new HttpRequestEventArgs (context); var args = new HttpRequestEventArgs (context);
var method = context.Request.HttpMethod; var method = context.Request.HttpMethod;
if (method == "GET") { if (method == "GET") {
if (OnGet != null) { if (OnGet != null) {
OnGet (this, args); OnGet (this, args);
@ -519,8 +508,7 @@ namespace WebSocketSharp.Server
var path = context.Path; var path = context.Path;
WebSocketServiceHost host; WebSocketServiceHost host;
if (path == null || if (path == null || !_services.TryGetServiceHostInternally (path, out host)) {
!_services.TryGetServiceHostInternally (path, out host)) {
context.Close (HttpStatusCode.NotImplemented); context.Close (HttpStatusCode.NotImplemented);
return; return;
} }
@ -528,8 +516,7 @@ namespace WebSocketSharp.Server
host.StartSession (context); host.StartSession (context);
} }
private bool authenticateRequest ( private bool authenticateRequest (AuthenticationSchemes scheme, HttpListenerContext context)
AuthenticationSchemes scheme, HttpListenerContext context)
{ {
if (context.Request.IsAuthenticated) if (context.Request.IsAuthenticated)
return true; return true;
@ -551,7 +538,7 @@ namespace WebSocketSharp.Server
if (_state == ServerState.START || _state == ServerState.SHUTDOWN) { if (_state == ServerState.START || _state == ServerState.SHUTDOWN) {
_logger.Error ( _logger.Error (
String.Format ( String.Format (
"The '{0}' property cannot set a value because the server has already been started.", "Set operation of {0} isn't available because the server has already started.",
property)); property));
return false; return false;
@ -576,10 +563,7 @@ namespace WebSocketSharp.Server
acceptRequestAsync (_listener.GetContext ()); acceptRequestAsync (_listener.GetContext ());
} }
catch (HttpListenerException ex) { catch (HttpListenerException ex) {
_logger.Warn ( _logger.Warn ("Receiving has been stopped.\nreason: " + ex.Message);
String.Format (
"Receiving has been stopped.\nreason: {0}.", ex.Message));
break; break;
} }
catch (Exception ex) { catch (Exception ex) {
@ -610,74 +594,64 @@ namespace WebSocketSharp.Server
#region Public Methods #region Public Methods
/// <summary> /// <summary>
/// Adds the specified typed WebSocket service with the specified /// Adds the specified typed WebSocket service with the specified <paramref name="path"/>.
/// <paramref name="servicePath"/>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// This method converts <paramref name="servicePath"/> to URL-decoded string /// This method converts <paramref name="path"/> to URL-decoded string and removes <c>'/'</c>
/// and removes <c>'/'</c> from tail end of <paramref name="servicePath"/>. /// from tail end of <paramref name="path"/>.
/// </remarks> /// </remarks>
/// <param name="servicePath"> /// <param name="path">
/// A <see cref="string"/> that represents the absolute path to the WebSocket /// A <see cref="string"/> that represents the absolute path to the WebSocket service to add.
/// service.
/// </param> /// </param>
/// <typeparam name="TWithNew"> /// <typeparam name="TWithNew">
/// The type of the WebSocket service. The TWithNew must inherit the /// The type of the WebSocket service.
/// <see cref="WebSocketService"/> class and must have a public parameterless /// The TWithNew must inherit the <see cref="WebSocketService"/> class and must have a public
/// constructor. /// parameterless constructor.
/// </typeparam> /// </typeparam>
public void AddWebSocketService<TWithNew> (string servicePath) public void AddWebSocketService<TWithNew> (string path)
where TWithNew : WebSocketService, new () where TWithNew : WebSocketService, new ()
{ {
AddWebSocketService<TWithNew> (servicePath, () => new TWithNew ()); AddWebSocketService<TWithNew> (path, () => new TWithNew ());
} }
/// <summary> /// <summary>
/// Adds the specified typed WebSocket service with the specified /// Adds the specified typed WebSocket service with the specified <paramref name="path"/> and
/// <paramref name="servicePath"/> and <paramref name="serviceConstructor"/>. /// <paramref name="constructor"/>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// <para> /// <para>
/// This method converts <paramref name="servicePath"/> to URL-decoded /// This method converts <paramref name="path"/> to URL-decoded string and removes <c>'/'</c>
/// string and removes <c>'/'</c> from tail end of /// from tail end of <paramref name="path"/>.
/// <paramref name="servicePath"/>.
/// </para> /// </para>
/// <para> /// <para>
/// <paramref name="serviceConstructor"/> returns a initialized specified /// <paramref name="constructor"/> returns a initialized specified typed
/// typed WebSocket service instance. /// <see cref="WebSocketService"/> instance.
/// </para> /// </para>
/// </remarks> /// </remarks>
/// <param name="servicePath"> /// <param name="path">
/// A <see cref="string"/> that represents the absolute path to the WebSocket /// A <see cref="string"/> that represents the absolute path to the WebSocket service to add.
/// service.
/// </param> /// </param>
/// <param name="serviceConstructor"> /// <param name="constructor">
/// A Func&lt;T&gt; delegate that references the method used to initialize /// A Func&lt;T&gt; delegate that references the method used to initialize a new specified
/// a new WebSocket service instance (a new WebSocket session). /// typed <see cref="WebSocketService"/> instance (a new <see cref="IWebSocketSession"/>
/// instance).
/// </param> /// </param>
/// <typeparam name="T"> /// <typeparam name="T">
/// The type of the WebSocket service. The T must inherit the /// The type of the WebSocket service. The T must inherit the <see cref="WebSocketService"/>
/// <see cref="WebSocketService"/> class. /// class.
/// </typeparam> /// </typeparam>
public void AddWebSocketService<T> ( public void AddWebSocketService<T> (string path, Func<T> constructor)
string servicePath, Func<T> serviceConstructor)
where T : WebSocketService where T : WebSocketService
{ {
var msg = servicePath.CheckIfValidServicePath () ?? var msg = path.CheckIfValidServicePath () ??
(serviceConstructor == null (constructor == null ? "'constructor' must not be null." : null);
? "'serviceConstructor' must not be null."
: null);
if (msg != null) { if (msg != null) {
_logger.Error ( _logger.Error (String.Format ("{0}\nservice path: {1}", msg, path));
String.Format ("{0}\nservice path: {1}", msg, servicePath ?? ""));
return; return;
} }
var host = new WebSocketServiceHost<T> ( var host = new WebSocketServiceHost<T> (path, constructor, _logger);
servicePath, serviceConstructor, _logger);
if (!KeepClean) if (!KeepClean)
host.KeepClean = false; host.KeepClean = false;
@ -688,12 +662,11 @@ namespace WebSocketSharp.Server
/// Gets the contents of the file with the specified <paramref name="path"/>. /// Gets the contents of the file with the specified <paramref name="path"/>.
/// </summary> /// </summary>
/// <returns> /// <returns>
/// An array of <see cref="byte"/> that receives the contents of the file if /// An array of <see cref="byte"/> that receives the contents of the file if it exists;
/// it exists; otherwise, <see langword="null"/>. /// otherwise, <see langword="null"/>.
/// </returns> /// </returns>
/// <param name="path"> /// <param name="path">
/// A <see cref="string"/> that represents the virtual path to the file /// A <see cref="string"/> that represents the virtual path to the file to find.
/// to get.
/// </param> /// </param>
public byte [] GetFile (string path) public byte [] GetFile (string path)
{ {
@ -707,31 +680,28 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Removes the WebSocket service with the specified <paramref name="servicePath"/>. /// Removes the WebSocket service with the specified <paramref name="path"/>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// This method converts <paramref name="servicePath"/> to URL-decoded string /// This method converts <paramref name="path"/> to URL-decoded string and removes <c>'/'</c>
/// and removes <c>'/'</c> from tail end of <paramref name="servicePath"/>. /// from tail end of <paramref name="path"/>.
/// </remarks> /// </remarks>
/// <returns> /// <returns>
/// <c>true</c> if the WebSocket service is successfully found and removed; /// <c>true</c> if the WebSocket service is successfully found and removed; otherwise,
/// otherwise, <c>false</c>. /// <c>false</c>.
/// </returns> /// </returns>
/// <param name="servicePath"> /// <param name="path">
/// A <see cref="string"/> that represents the absolute path to the WebSocket /// A <see cref="string"/> that represents the absolute path to the WebSocket service to find.
/// service to find.
/// </param> /// </param>
public bool RemoveWebSocketService (string servicePath) public bool RemoveWebSocketService (string path)
{ {
var msg = servicePath.CheckIfValidServicePath (); var msg = path.CheckIfValidServicePath ();
if (msg != null) { if (msg != null) {
_logger.Error ( _logger.Error (String.Format ("{0}\nservice path: {1}", msg, path));
String.Format ("{0}\nservice path: {1}", msg, servicePath));
return false; return false;
} }
return _services.Remove (servicePath); return _services.Remove (path);
} }
/// <summary> /// <summary>
@ -742,10 +712,7 @@ namespace WebSocketSharp.Server
lock (_sync) { lock (_sync) {
var msg = _state.CheckIfStartable () ?? checkIfCertExists (); var msg = _state.CheckIfStartable () ?? checkIfCertExists ();
if (msg != null) { if (msg != null) {
_logger.Error ( _logger.Error (String.Format ("{0}\nstate: {1}\nsecure: {2}", msg, _state, _secure));
String.Format (
"{0}\nstate: {1}\nsecure: {2}", msg, _state, _secure));
return; return;
} }
@ -779,12 +746,11 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Stops receiving the HTTP requests with the specified <see cref="ushort"/> /// Stops receiving the HTTP requests with the specified <see cref="ushort"/> and
/// and <see cref="string"/> used to stop the WebSocket services. /// <see cref="string"/> used to stop the WebSocket services.
/// </summary> /// </summary>
/// <param name="code"> /// <param name="code">
/// A <see cref="ushort"/> that represents the status code indicating the /// A <see cref="ushort"/> that represents the status code indicating the reason for stop.
/// reason for stop.
/// </param> /// </param>
/// <param name="reason"> /// <param name="reason">
/// A <see cref="string"/> that represents the reason for stop. /// A <see cref="string"/> that represents the reason for stop.
@ -799,8 +765,7 @@ namespace WebSocketSharp.Server
if (msg != null) { if (msg != null) {
_logger.Error ( _logger.Error (
String.Format ( String.Format ("{0}\nstate: {1}\ncode: {2}\nreason: {3}", msg, _state, code, reason));
"{0}\nstate: {1}\ncode: {2}\nreason: {3}", msg, _state, code, reason));
return; return;
} }
@ -815,12 +780,12 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Stops receiving the HTTP requests with the specified <see cref="CloseStatusCode"/> /// Stops receiving the HTTP requests with the specified <see cref="CloseStatusCode"/> and
/// and <see cref="string"/> used to stop the WebSocket services. /// <see cref="string"/> used to stop the WebSocket services.
/// </summary> /// </summary>
/// <param name="code"> /// <param name="code">
/// One of the <see cref="CloseStatusCode"/> enum values, represents the /// One of the <see cref="CloseStatusCode"/> enum values, represents the status code indicating
/// status code indicating the reasons for stop. /// the reasons for stop.
/// </param> /// </param>
/// <param name="reason"> /// <param name="reason">
/// A <see cref="string"/> that represents the reason for stop. /// A <see cref="string"/> that represents the reason for stop.
@ -833,9 +798,7 @@ namespace WebSocketSharp.Server
(data = ((ushort) code).Append (reason)).CheckIfValidControlData ("reason"); (data = ((ushort) code).Append (reason)).CheckIfValidControlData ("reason");
if (msg != null) { if (msg != null) {
_logger.Error ( _logger.Error (String.Format ("{0}\nstate: {1}\nreason: {2}", msg, _state, reason));
String.Format ("{0}\nstate: {1}\nreason: {2}", msg, _state, reason));
return; return;
} }

33
websocket-sharp/Server/WebSocketServer.cs
View File

@ -148,11 +148,10 @@ namespace WebSocketSharp.Server
var host = _uri.DnsSafeHost; var host = _uri.DnsSafeHost;
_address = host.ToIPAddress (); _address = host.ToIPAddress ();
if (_address == null || !_address.IsLocal ()) if (_address == null || !_address.IsLocal ())
throw new ArgumentException ( throw new ArgumentException ("The host part must be the local host name: " + host, "url");
String.Format ("The host part must be the local host name: {0}", host), "url");
_port = _uri.Port; _port = _uri.Port;
_secure = _uri.Scheme == "wss" ? true : false; _secure = _uri.Scheme == "wss";
init (); init ();
} }
@ -212,7 +211,7 @@ namespace WebSocketSharp.Server
/// <paramref name="address"/> isn't a local IP address. /// <paramref name="address"/> isn't a local IP address.
/// </exception> /// </exception>
public WebSocketServer (System.Net.IPAddress address, int port) public WebSocketServer (System.Net.IPAddress address, int port)
: this (address, port, port == 443 ? true : false) : this (address, port, port == 443)
{ {
} }
@ -254,8 +253,7 @@ namespace WebSocketSharp.Server
public WebSocketServer (System.Net.IPAddress address, int port, bool secure) public WebSocketServer (System.Net.IPAddress address, int port, bool secure)
{ {
if (!address.IsLocal ()) if (!address.IsLocal ())
throw new ArgumentException ( throw new ArgumentException ("Must be the local IP address: " + address, "address");
String.Format ("Must be the local IP address: {0}", address), "address");
if (!port.IsPortNumber ()) if (!port.IsPortNumber ())
throw new ArgumentOutOfRangeException ("port", "Must be between 1 and 65535: " + port); throw new ArgumentOutOfRangeException ("port", "Must be between 1 and 65535: " + port);
@ -344,8 +342,7 @@ namespace WebSocketSharp.Server
/// Gets a value indicating whether the server provides a secure connection. /// Gets a value indicating whether the server provides a secure connection.
/// </summary> /// </summary>
/// <value> /// <value>
/// <c>true</c> if the server provides a secure connection; otherwise, /// <c>true</c> if the server provides a secure connection; otherwise, <c>false</c>.
/// <c>false</c>.
/// </value> /// </value>
public bool IsSecure { public bool IsSecure {
get { get {
@ -469,8 +466,7 @@ namespace WebSocketSharp.Server
_listener.Stop (); _listener.Stop ();
_services.Stop ( _services.Stop (
((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG), ((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG), true);
true);
_state = ServerState.STOP; _state = ServerState.STOP;
} }
@ -511,11 +507,11 @@ namespace WebSocketSharp.Server
} }
private bool authenticateRequest ( private bool authenticateRequest (
AuthenticationSchemes authScheme, TcpListenerWebSocketContext context) AuthenticationSchemes scheme, TcpListenerWebSocketContext context)
{ {
var challenge = authScheme == AuthenticationSchemes.Basic var challenge = scheme == AuthenticationSchemes.Basic
? HttpUtility.CreateBasicAuthChallenge (Realm) ? HttpUtility.CreateBasicAuthChallenge (Realm)
: authScheme == AuthenticationSchemes.Digest : scheme == AuthenticationSchemes.Digest
? HttpUtility.CreateDigestAuthChallenge (Realm) ? HttpUtility.CreateDigestAuthChallenge (Realm)
: null; : null;
@ -525,7 +521,7 @@ namespace WebSocketSharp.Server
} }
var retry = -1; var retry = -1;
var expected = authScheme.ToString (); var expected = scheme.ToString ();
var realm = Realm; var realm = Realm;
var credentialsFinder = UserCredentialsFinder; var credentialsFinder = UserCredentialsFinder;
Func<bool> auth = null; Func<bool> auth = null;
@ -542,7 +538,7 @@ namespace WebSocketSharp.Server
return auth (); return auth ();
} }
context.SetUser (authScheme, realm, credentialsFinder); context.SetUser (scheme, realm, credentialsFinder);
if (context.IsAuthenticated) if (context.IsAuthenticated)
return true; return true;
@ -591,8 +587,7 @@ namespace WebSocketSharp.Server
acceptRequestAsync (_listener.AcceptTcpClient ()); acceptRequestAsync (_listener.AcceptTcpClient ());
} }
catch (SocketException ex) { catch (SocketException ex) {
_logger.Warn (String.Format ("Receiving has been stopped.\nreason: {0}.", ex.Message)); _logger.Warn ("Receiving has been stopped.\nreason: " + ex.Message);
break; break;
} }
catch (Exception ex) { catch (Exception ex) {
@ -692,7 +687,6 @@ namespace WebSocketSharp.Server
if (msg != null) { if (msg != null) {
_logger.Error (String.Format ("{0}\nservice path: {1}", msg, path)); _logger.Error (String.Format ("{0}\nservice path: {1}", msg, path));
return; return;
} }
@ -722,7 +716,6 @@ namespace WebSocketSharp.Server
var msg = path.CheckIfValidServicePath (); var msg = path.CheckIfValidServicePath ();
if (msg != null) { if (msg != null) {
_logger.Error (String.Format ("{0}\nservice path: {1}", msg, path)); _logger.Error (String.Format ("{0}\nservice path: {1}", msg, path));
return false; return false;
} }
@ -738,7 +731,6 @@ namespace WebSocketSharp.Server
var msg = _state.CheckIfStartable () ?? checkIfCertExists (); var msg = _state.CheckIfStartable () ?? checkIfCertExists ();
if (msg != null) { if (msg != null) {
_logger.Error (String.Format ("{0}\nstate: {1}\nsecure: {2}", msg, _state, _secure)); _logger.Error (String.Format ("{0}\nstate: {1}\nsecure: {2}", msg, _state, _secure));
return; return;
} }
@ -825,7 +817,6 @@ namespace WebSocketSharp.Server
if (msg != null) { if (msg != null) {
_logger.Error (String.Format ("{0}\nstate: {1}\nreason: {2}", msg, _state, reason)); _logger.Error (String.Format ("{0}\nstate: {1}\nreason: {2}", msg, _state, reason));
return; return;
} }