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

Refactored HttpServer.cs and WebSocketServer.cs

Browse Source
This commit is contained in:
sta
2014-09-01 14:27:04 +09:00
parent e15cc63036
commit d9528ffe75
2 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ namespace WebSocketSharp.Server
/// Provides a simple HTTP server that allows to accept the WebSocket connection requests.
/// </summary>
/// <remarks>
/// The HttpServer class can provide the multi WebSocket services.
/// The HttpServer class can provide multiple WebSocket services.
/// </remarks>
public class HttpServer
{
@@ -480,12 +480,12 @@ namespace WebSocketSharp.Server
? OnPatch
: null;
if (evt != null) {
if (evt != null)
evt (this, new HttpRequestEventArgs (context));
return;
}
else
context.Response.StatusCode = (int) HttpStatusCode.NotImplemented;
context.Response.StatusCode = (int) HttpStatusCode.NotImplemented;
context.Response.Close ();
}
private void processRequestAsync (HttpListenerContext context)
@@ -504,7 +504,6 @@ namespace WebSocketSharp.Server
}
processHttpRequest (context);
context.Response.Close ();
}
catch (Exception ex) {
_logger.Fatal (ex.ToString ());

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

@@ -52,7 +52,7 @@ namespace WebSocketSharp.Server
/// Provides a WebSocket protocol server.
/// </summary>
/// <remarks>
/// The WebSocketServer class provides the multi WebSocket service.
/// The WebSocketServer class can provide multiple WebSocket services.
/// </remarks>
public class WebSocketServer
{
@@ -86,7 +86,7 @@ namespace WebSocketSharp.Server
/// on port 80.
/// </remarks>
public WebSocketServer ()
: this (80)
: this (System.Net.IPAddress.Any, 80, false)
{
}
@@ -110,7 +110,7 @@ namespace WebSocketSharp.Server
/// <paramref name="port"/> isn't between 1 and 65535.
/// </exception>
public WebSocketServer (int port)
: this (System.Net.IPAddress.Any, port)
: this (System.Net.IPAddress.Any, port, port == 443)
{
}
@@ -302,8 +302,11 @@ namespace WebSocketSharp.Server
}
set {
if (!canSet ("AuthenticationSchemes"))
var msg = _state.CheckIfStartable ();
if (msg != null) {
_logger.Error (msg);
return;
}
_authSchemes = value;
}
@@ -322,8 +325,11 @@ namespace WebSocketSharp.Server
}
set {
if (!canSet ("Certificate"))
var msg = _state.CheckIfStartable ();
if (msg != null) {
_logger.Error (msg);
return;
}
_certificate = value;
}
@@ -358,8 +364,8 @@ namespace WebSocketSharp.Server
/// periodically.
/// </summary>
/// <value>
/// <c>true</c> if the server cleans up the inactive sessions every 60 seconds; otherwise,
/// <c>false</c>. The default value is <c>true</c>.
/// <c>true</c> if the server cleans up the inactive sessions every 60 seconds;
/// otherwise, <c>false</c>. The default value is <c>true</c>.
/// </value>
public bool KeepClean {
get {
@@ -413,8 +419,11 @@ namespace WebSocketSharp.Server
}
set {
if (!canSet ("Realm"))
var msg = _state.CheckIfStartable ();
if (msg != null) {
_logger.Error (msg);
return;
}
_realm = value;
}
@@ -438,8 +447,11 @@ namespace WebSocketSharp.Server
}
set {
if (!canSet ("ReuseAddress"))
var msg = _state.CheckIfStartable ();
if (msg != null) {
_logger.Error (msg);
return;
}
if (value ^ _reuseAddress) {
_listener.Server.SetSocketOption (
@@ -465,8 +477,11 @@ namespace WebSocketSharp.Server
}
set {
if (!canSet ("UserCredentialsFinder"))
var msg = _state.CheckIfStartable ();
if (msg != null) {
_logger.Error (msg);
return;
}
_credentialsFinder = value;
}
@@ -537,30 +552,17 @@ namespace WebSocketSharp.Server
}
context.SetUser (scheme, realm, credFinder);
if (context.IsAuthenticated)
return true;
if (!context.IsAuthenticated) {
context.SendAuthenticationChallenge (chal);
return auth ();
}
context.SendAuthenticationChallenge (chal);
return auth ();
return true;
};
return auth ();
}
private bool canSet (string property)
{
if (_state == ServerState.Start || _state == ServerState.ShuttingDown) {
_logger.Error (
String.Format (
"Set operation of {0} isn't available because the server has already started.",
property));
return false;
}
return true;
}
private string checkIfCertificateExists ()
{
return _secure && _certificate == null
@@ -703,8 +705,8 @@ namespace WebSocketSharp.Server
/// </summary>
/// <remarks>
/// <para>
/// This method converts <paramref name="path"/> to URL-decoded string and removes <c>'/'</c>
/// from tail end of <paramref name="path"/>.
/// This method converts <paramref name="path"/> to URL-decoded string and
/// removes <c>'/'</c> from tail end of <paramref name="path"/>.
/// </para>
/// <para>
/// <paramref name="initializer"/> returns an initialized specified typed
@@ -745,12 +747,12 @@ namespace WebSocketSharp.Server
/// Removes the WebSocket service with the specified <paramref name="path"/>.
/// </summary>
/// <remarks>
/// This method converts <paramref name="path"/> to URL-decoded string and removes <c>'/'</c>
/// from tail end of <paramref name="path"/>.
/// This method converts <paramref name="path"/> to URL-decoded string and
/// removes <c>'/'</c> from tail end of <paramref name="path"/>.
/// </remarks>
/// <returns>
/// <c>true</c> if the WebSocket service is successfully found and removed; otherwise,
/// <c>false</c>.
/// <c>true</c> if the WebSocket service is successfully found and removed;
/// otherwise, <c>false</c>.
/// </returns>
/// <param name="path">
/// A <see cref="string"/> that represents the absolute path to the WebSocket service to find.