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

Fix a few for EndPointListener.cs

Browse Source
This commit is contained in:
sta 2014-05-02 21:54:58 +09:00
parent 8461d24f9d
commit 07fce5485a
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
websocket-sharp/Net/EndPointListener.cs
View File

@ -115,8 +115,9 @@ namespace WebSocketSharp.Net
if (prefixes == null) if (prefixes == null)
return; return;
foreach (var p in prefixes) var path = prefix.Path;
if (p.Path == prefix.Path) // TODO: Code. foreach (var pref in prefixes)
if (pref.Path == path) // TODO: Code?
throw new HttpListenerException (400, "Prefix already in use."); throw new HttpListenerException (400, "Prefix already in use.");
prefixes.Add (prefix); prefixes.Add (prefix);
@ -178,15 +179,15 @@ namespace WebSocketSharp.Net
HttpListener bestMatch = null; HttpListener bestMatch = null;
var bestLength = -1; var bestLength = -1;
foreach (var p in list) { foreach (var pref in list) {
var ppath = p.Path; var ppath = pref.Path;
if (ppath.Length < bestLength) if (ppath.Length < bestLength)
continue; continue;
if (path.StartsWith (ppath)) { if (path.StartsWith (ppath)) {
bestLength = ppath.Length; bestLength = ppath.Length;
bestMatch = p.Listener; bestMatch = pref.Listener;
prefix = p; prefix = pref;
} }
} }
@ -239,9 +240,10 @@ namespace WebSocketSharp.Net
if (prefixes == null) if (prefixes == null)
return false; return false;
var path = prefix.Path;
var count = prefixes.Count; var count = prefixes.Count;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
if (prefixes [i].Path == prefix.Path) { if (prefixes [i].Path == path) {
prefixes.RemoveAt (i); prefixes.RemoveAt (i);
return true; return true;
} }
@ -260,21 +262,22 @@ namespace WebSocketSharp.Net
var port = uri.Port; var port = uri.Port;
var path = HttpUtility.UrlDecode (uri.AbsolutePath); var path = HttpUtility.UrlDecode (uri.AbsolutePath);
var pathSlash = path [path.Length - 1] == '/' ? path : path + "/"; var pathSlash = path [path.Length - 1] == '/' ? path : path + "/";
HttpListener bestMatch = null; HttpListener bestMatch = null;
var bestLength = -1; var bestLength = -1;
if (host != null && host.Length > 0) { if (host != null && host.Length > 0) {
foreach (var p in _prefixes.Keys) { foreach (var pref in _prefixes.Keys) {
var ppath = p.Path; var ppath = pref.Path;
if (ppath.Length < bestLength) if (ppath.Length < bestLength)
continue; continue;
if (p.Host != host || p.Port != port) if (pref.Host != host || pref.Port != port)
continue; continue;
if (path.StartsWith (ppath) || pathSlash.StartsWith (ppath)) { if (path.StartsWith (ppath) || pathSlash.StartsWith (ppath)) {
bestLength = ppath.Length; bestLength = ppath.Length;
bestMatch = _prefixes [p]; bestMatch = _prefixes [pref];
prefix = p; prefix = pref;
} }
} }
@ -356,21 +359,21 @@ namespace WebSocketSharp.Net
return; return;
} }
Dictionary<ListenerPrefix, HttpListener> prefs, p2; Dictionary<ListenerPrefix, HttpListener> prefs, prefs2;
do { do {
prefs = _prefixes; prefs = _prefixes;
if (prefs.ContainsKey (prefix)) { if (prefs.ContainsKey (prefix)) {
var other = prefs [prefix]; var other = prefs [prefix];
if (other != listener) // TODO: Code. if (other != listener) // TODO: Code?
throw new HttpListenerException (400, "There's another listener for " + prefix); throw new HttpListenerException (400, "There's another listener for " + prefix);
return; return;
} }
p2 = new Dictionary<ListenerPrefix, HttpListener> (prefs); prefs2 = new Dictionary<ListenerPrefix, HttpListener> (prefs);
p2 [prefix] = listener; prefs2 [prefix] = listener;
} }
while (Interlocked.CompareExchange (ref _prefixes, p2, prefs) != prefs); while (Interlocked.CompareExchange (ref _prefixes, prefs2, prefs) != prefs);
} }
public bool BindContext (HttpListenerContext context) public bool BindContext (HttpListenerContext context)
@ -389,13 +392,14 @@ namespace WebSocketSharp.Net
public void Close () public void Close ()
{ {
_socket.Close (); _socket.Close ();
lock (((ICollection) _unregistered).SyncRoot) { lock (((ICollection) _unregistered).SyncRoot) {
var copy = new Dictionary<HttpConnection, HttpConnection> (_unregistered); var conns = new List<HttpConnection> (_unregistered.Keys);
foreach (var conn in copy.Keys) _unregistered.Clear ();
foreach (var conn in conns)
conn.Close (true); conn.Close (true);
copy.Clear (); conns.Clear ();
_unregistered.Clear ();
} }
} }
@ -434,16 +438,16 @@ namespace WebSocketSharp.Net
return; return;
} }
Dictionary<ListenerPrefix, HttpListener> prefs, p2; Dictionary<ListenerPrefix, HttpListener> prefs, prefs2;
do { do {
prefs = _prefixes; prefs = _prefixes;
if (!prefs.ContainsKey (prefix)) if (!prefs.ContainsKey (prefix))
break; break;
p2 = new Dictionary<ListenerPrefix, HttpListener> (prefs); prefs2 = new Dictionary<ListenerPrefix, HttpListener> (prefs);
p2.Remove (prefix); prefs2.Remove (prefix);
} }
while (Interlocked.CompareExchange (ref _prefixes, p2, prefs) != prefs); while (Interlocked.CompareExchange (ref _prefixes, prefs2, prefs) != prefs);
checkIfRemove (); checkIfRemove ();
} }