Refactored ListenerPrefix.cs
This commit is contained in:
sta
parent
8ec0711bde
commit
aa3f297670
@ -1,33 +1,42 @@
|
||||
//
|
||||
// ListenerPrefix.cs
|
||||
// Copied from System.ListenerPrefix.cs
|
||||
//
|
||||
// Author:
|
||||
// Gonzalo Paniagua Javier (gonzalo@novell.com)
|
||||
// Oleg Mihailik (mihailik gmail co_m)
|
||||
//
|
||||
// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
|
||||
// Copyright (c) 2012-2013 sta.blockhead
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
#region License
|
||||
/*
|
||||
* ListenerPrefix.cs
|
||||
*
|
||||
* This code is derived from System.Net.ListenerPrefix.cs of Mono
|
||||
* (http://www.mono-project.com).
|
||||
*
|
||||
* The MIT License
|
||||
*
|
||||
* Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
|
||||
* Copyright (c) 2012-2014 sta.blockhead
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
#endregion
|
||||
|
||||
#region Authors
|
||||
/*
|
||||
* Authors:
|
||||
* - Gonzalo Paniagua Javier <gonzalo@novell.com>
|
||||
* - Oleg Mihailik <mihailik@gmail.com>
|
||||
*/
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.Net;
|
||||
@ -106,30 +115,28 @@ namespace WebSocketSharp.Net
|
||||
|
||||
private void parse (string uriPrefix)
|
||||
{
|
||||
int default_port = uriPrefix.StartsWith ("http://") ? 80 : 443;
|
||||
if (default_port == 443)
|
||||
var defaultPort = uriPrefix.StartsWith ("https://") ? 443 : 80;
|
||||
if (defaultPort == 443)
|
||||
_secure = true;
|
||||
|
||||
int length = uriPrefix.Length;
|
||||
int start_host = uriPrefix.IndexOf (':') + 3;
|
||||
int colon = uriPrefix.IndexOf (':', start_host, length - start_host);
|
||||
var length = uriPrefix.Length;
|
||||
var startHost = uriPrefix.IndexOf (':') + 3;
|
||||
var colon = uriPrefix.IndexOf (':', startHost, length - startHost);
|
||||
int root;
|
||||
if (colon > 0)
|
||||
{
|
||||
if (colon > 0) {
|
||||
root = uriPrefix.IndexOf ('/', colon, length - colon);
|
||||
_host = uriPrefix.Substring (start_host, colon - start_host);
|
||||
_host = uriPrefix.Substring (startHost, colon - startHost);
|
||||
_port = (ushort) Int32.Parse (uriPrefix.Substring (colon + 1, root - colon - 1));
|
||||
_path = uriPrefix.Substring (root);
|
||||
}
|
||||
else
|
||||
{
|
||||
root = uriPrefix.IndexOf ('/', start_host, length - start_host);
|
||||
_host = uriPrefix.Substring (start_host, root - start_host);
|
||||
_port = (ushort) default_port;
|
||||
else {
|
||||
root = uriPrefix.IndexOf ('/', startHost, length - startHost);
|
||||
_host = uriPrefix.Substring (startHost, root - startHost);
|
||||
_port = (ushort) defaultPort;
|
||||
_path = uriPrefix.Substring (root);
|
||||
}
|
||||
|
||||
if (_path.Length != 1)
|
||||
if (_path.Length > 1)
|
||||
_path = _path.Substring (0, _path.Length - 1);
|
||||
}
|
||||
|
||||
@ -142,41 +149,31 @@ namespace WebSocketSharp.Net
|
||||
if (uriPrefix == null)
|
||||
throw new ArgumentNullException ("uriPrefix");
|
||||
|
||||
int default_port = uriPrefix.StartsWith ("http://") ? 80 : -1;
|
||||
if (default_port == -1)
|
||||
default_port = uriPrefix.StartsWith ("https://") ? 443 : -1;
|
||||
|
||||
if (default_port == -1)
|
||||
if (!uriPrefix.StartsWith ("http://") && !uriPrefix.StartsWith ("https://"))
|
||||
throw new ArgumentException ("Only 'http' and 'https' schemes are supported.");
|
||||
|
||||
int length = uriPrefix.Length;
|
||||
int start_host = uriPrefix.IndexOf (':') + 3;
|
||||
if (start_host >= length)
|
||||
var length = uriPrefix.Length;
|
||||
var startHost = uriPrefix.IndexOf (':') + 3;
|
||||
if (startHost >= length)
|
||||
throw new ArgumentException ("No host specified.");
|
||||
|
||||
int colon = uriPrefix.IndexOf (':', start_host, length - start_host);
|
||||
if (start_host == colon)
|
||||
var colon = uriPrefix.IndexOf (':', startHost, length - startHost);
|
||||
if (startHost == colon)
|
||||
throw new ArgumentException ("No host specified.");
|
||||
|
||||
int root;
|
||||
if (colon > 0)
|
||||
{
|
||||
if (colon > 0) {
|
||||
root = uriPrefix.IndexOf ('/', colon, length - colon);
|
||||
if (root == -1)
|
||||
throw new ArgumentException ("No path specified.");
|
||||
|
||||
try {
|
||||
int port = Int32.Parse (uriPrefix.Substring (colon + 1, root - colon - 1));
|
||||
if (port <= 0 || port >= 65536)
|
||||
throw new Exception ();
|
||||
}
|
||||
catch {
|
||||
int port;
|
||||
if (!Int32.TryParse (uriPrefix.Substring (colon + 1, root - colon - 1), out port) ||
|
||||
(port <= 0 || port >= 65536))
|
||||
throw new ArgumentException ("Invalid port.");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
root = uriPrefix.IndexOf ('/', start_host, length - start_host);
|
||||
else {
|
||||
root = uriPrefix.IndexOf ('/', startHost, length - startHost);
|
||||
if (root == -1)
|
||||
throw new ArgumentException ("No path specified.");
|
||||
}
|
||||
@ -189,10 +186,9 @@ namespace WebSocketSharp.Net
|
||||
public override bool Equals (object obj)
|
||||
{
|
||||
var other = obj as ListenerPrefix;
|
||||
if (other == null)
|
||||
return false;
|
||||
|
||||
return _original == other._original;
|
||||
return other != null
|
||||
? _original == other._original
|
||||
: false;
|
||||
}
|
||||
|
||||
public override int GetHashCode ()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user