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

Fix for pull request #115, added the Address property to the HttpServer class

Browse Source
This commit is contained in:
sta 2015-07-12 16:56:02 +09:00
parent 3c0fa929a1
commit d2dc6ff959
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,8 @@ namespace WebSocketSharp.Server
{ {
#region Private Fields #region Private Fields
private System.Net.IPAddress _address;
private string _hostname;
private HttpListener _listener; private HttpListener _listener;
private Logger _logger; private Logger _logger;
private int _port; private int _port;
@ -83,7 +85,7 @@ namespace WebSocketSharp.Server
/// </remarks> /// </remarks>
public HttpServer () public HttpServer ()
{ {
init ("*", 80, false); init ("*", System.Net.IPAddress.Any, 80, false);
} }
/// <summary> /// <summary>
@ -134,7 +136,7 @@ namespace WebSocketSharp.Server
throw new ArgumentOutOfRangeException ( throw new ArgumentOutOfRangeException (
"port", "Not between 1 and 65535 inclusive: " + port); "port", "Not between 1 and 65535 inclusive: " + port);
init ("*", port, secure); init ("*", System.Net.IPAddress.Any, port, secure);
} }
/// <summary> /// <summary>
@ -210,13 +212,25 @@ namespace WebSocketSharp.Server
throw new ArgumentOutOfRangeException ( throw new ArgumentOutOfRangeException (
"port", "Not between 1 and 65535 inclusive: " + port); "port", "Not between 1 and 65535 inclusive: " + port);
init (address.ToString (), port, secure); init (null, address, port, secure);
} }
#endregion #endregion
#region Public Properties #region Public Properties
/// <summary>
/// Gets the local IP address of the server.
/// </summary>
/// <value>
/// A <see cref="System.Net.IPAddress"/> that represents the local IP address of the server.
/// </value>
public System.Net.IPAddress Address {
get {
return _address;
}
}
/// <summary> /// <summary>
/// Gets or sets the scheme used to authenticate the clients. /// Gets or sets the scheme used to authenticate the clients.
/// </summary> /// </summary>
@ -559,14 +573,16 @@ namespace WebSocketSharp.Server
return !(usr || port) ? "The secure connection requires a server certificate." : null; return !(usr || port) ? "The secure connection requires a server certificate." : null;
} }
private void init (string hostname, int port, bool secure) private void init (string hostname, System.Net.IPAddress address, int port, bool secure)
{ {
_hostname = hostname ?? address.ToString ();
_address = address;
_port = port; _port = port;
_secure = secure; _secure = secure;
_listener = new HttpListener (); _listener = new HttpListener ();
_listener.Prefixes.Add ( _listener.Prefixes.Add (
String.Format ("http{0}://{1}:{2}/", secure ? "s" : "", hostname, port)); String.Format ("http{0}://{1}:{2}/", secure ? "s" : "", _hostname, port));
_logger = _listener.Log; _logger = _listener.Log;
_services = new WebSocketServiceManager (_logger); _services = new WebSocketServiceManager (_logger);