// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0 && SECURITY_DEP
-
using System.Collections;
using System.Collections.Generic;
namespace System.Net {
sealed class EndPointManager
{
- static Dictionary<IPAddress, Dictionary<int, EndPointListener>> ip_to_endpoints =
- new Dictionary<IPAddress, Dictionary<int, EndPointListener>> ();
+ // Dictionary<IPAddress, Dictionary<int, EndPointListener>>
+ static Hashtable ip_to_endpoints = new Hashtable ();
private EndPointManager ()
{
public static void AddListener (HttpListener listener)
{
- List<string> added = new List<string> ();
+ ArrayList added = new ArrayList ();
try {
lock (ip_to_endpoints) {
foreach (string prefix in listener.Prefixes) {
}
} catch {
foreach (string prefix in added) {
- RemovePrefixInternal (prefix, listener);
+ RemovePrefix (prefix, listener);
}
throw;
}
if (lp.Path.IndexOf ('%') != -1)
throw new HttpListenerException (400, "Invalid path.");
- if (lp.Path.IndexOf ("//") != -1) // TODO: Code?
+ if (lp.Path.IndexOf ("//", StringComparison.Ordinal) != -1) // TODO: Code?
throw new HttpListenerException (400, "Invalid path.");
- // Always listens on all the interfaces, no matter the host name/ip used.
- EndPointListener epl = GetEPListener (IPAddress.Any, lp.Port, listener, lp.Secure);
+ // listens on all the interfaces if host name cannot be parsed by IPAddress.
+ EndPointListener epl = GetEPListener (lp.Host, lp.Port, listener, lp.Secure);
epl.AddPrefix (lp, listener);
}
- static EndPointListener GetEPListener (IPAddress addr, int port, HttpListener listener, bool secure)
+ static EndPointListener GetEPListener (string host, int port, HttpListener listener, bool secure)
{
- Dictionary<int, EndPointListener> p = null;
+ IPAddress addr;
+ if (host == "*")
+ addr = IPAddress.Any;
+ else if (IPAddress.TryParse(host, out addr) == false){
+ try {
+ IPHostEntry iphost = Dns.GetHostByName(host);
+ if (iphost != null)
+ addr = iphost.AddressList[0];
+ else
+ addr = IPAddress.Any;
+ } catch {
+ addr = IPAddress.Any;
+ }
+ }
+ Hashtable p = null; // Dictionary<int, EndPointListener>
if (ip_to_endpoints.ContainsKey (addr)) {
- p = ip_to_endpoints [addr];
+ p = (Hashtable) ip_to_endpoints [addr];
} else {
- p = new Dictionary<int, EndPointListener> ();
+ p = new Hashtable ();
ip_to_endpoints [addr] = p;
}
EndPointListener epl = null;
if (p.ContainsKey (port)) {
- epl = p [port];
+ epl = (EndPointListener) p [port];
} else {
- epl = new EndPointListener (addr, port, secure);
+ epl = new EndPointListener (listener, addr, port, secure);
p [port] = epl;
}
public static void RemoveEndPoint (EndPointListener epl, IPEndPoint ep)
{
lock (ip_to_endpoints) {
- Dictionary<int, EndPointListener> p = null;
- p = ip_to_endpoints [ep.Address];
+ // Dictionary<int, EndPointListener> p
+ Hashtable p = null;
+ p = (Hashtable) ip_to_endpoints [ep.Address];
p.Remove (ep.Port);
+ if (p.Count == 0) {
+ ip_to_endpoints.Remove (ep.Address);
+ }
epl.Close ();
}
}
if (lp.Path.IndexOf ('%') != -1)
return;
- if (lp.Path.IndexOf ("//") != -1)
+ if (lp.Path.IndexOf ("//", StringComparison.Ordinal) != -1)
return;
- EndPointListener epl = GetEPListener (IPAddress.Any, lp.Port, listener, lp.Secure);
+ EndPointListener epl = GetEPListener (lp.Host, lp.Port, listener, lp.Secure);
epl.RemovePrefix (lp, listener);
}
}
}
-#endif