Pulled out HelloNeighbour into its own service, INeighbourService, which may get more functions as we go along. It's a very simple service and service connectors, and it served primarily to establish the design of services that dependent on Scenes and that must always have a local connector. More refactoring coming, as this showed how to do it right.

author: diva 2009-06-14 15:35:09 +0000
committer: diva 2009-06-14 15:35:09 +0000
commit: 7a9c85526cb99495bdd436150679941ef021b782 (patch)
tree: 888b5bdf86f8327d2df0c1ca8f1cd3dd999d125d /OpenSim/Server/Handlers/Base/Utils.cs
parent: * Temporarily resolve another problem in http://opensimulator.org/mantis/view... (diff)
download: opensim-SC-7a9c85526cb99495bdd436150679941ef021b782.zip
opensim-SC-7a9c85526cb99495bdd436150679941ef021b782.tar.gz
opensim-SC-7a9c85526cb99495bdd436150679941ef021b782.tar.bz2
opensim-SC-7a9c85526cb99495bdd436150679941ef021b782.tar.xz
1 files changed, 97 insertions, 97 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/Utils.cs b/OpenSim/Server/Handlers/Base/Utils.cs
index e21d1b8..f1610ff 100644
--- a/OpenSim/Server/Handlers/Simulation/Utils.cs
+++ b/OpenSim/Server/Handlers/Base/Utils.cs
@@ -1,97 +1,97 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
+ *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.Net;
+using System.Net;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Services.Interfaces;
+using OpenSim.Services.Interfaces;
-using OpenMetaverse;
+using OpenMetaverse;
-namespace OpenSim.Server.Handlers.Simulation
+namespace OpenSim.Server.Handlers.Base
-{
+{
-    public class Utils
+    public class RestHandlerUtils
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// Extract the param from an uri.
+        /// Extract the param from an uri.
-        /// </summary>
+        /// </summary>
-        /// <param name="uri">Something like this: /uuid/ or /uuid/handle/release</param>
+        /// <param name="uri">Something like this: /uuid/ or /uuid/handle/release</param>
-        /// <param name="uri">uuid on uuid field</param>
+        /// <param name="uri">uuid on uuid field</param>
-        /// <param name="action">optional action</param>
+        /// <param name="action">optional action</param>
-        public static bool GetParams(string path, out UUID uuid, out ulong regionHandle, out string action)
+        public static bool GetParams(string path, out UUID uuid, out ulong regionHandle, out string action)
-        {
+        {
-            uuid = UUID.Zero;
+            uuid = UUID.Zero;
-            action = "";
+            action = "";
-            regionHandle = 0;
+            regionHandle = 0;
-            path = path.Trim(new char[] { '/' });
+            path = path.Trim(new char[] { '/' });
-            string[] parts = path.Split('/');
+            string[] parts = path.Split('/');
-            if (parts.Length <= 1)
+            if (parts.Length <= 1)
-            {
+            {
-                return false;
+                return false;
-            }
+            }
-            else
+            else
-            {
+            {
-                if (!UUID.TryParse(parts[0], out uuid))
+                if (!UUID.TryParse(parts[0], out uuid))
-                    return false;
+                    return false;
-                if (parts.Length >= 2)
+                if (parts.Length >= 2)
-                    UInt64.TryParse(parts[1], out regionHandle);
+                    UInt64.TryParse(parts[1], out regionHandle);
-                if (parts.Length >= 3)
+                if (parts.Length >= 3)
-                    action = parts[2];
+                    action = parts[2];
-                return true;
+                return true;
-            }
+            }
-        }
+        }
-        public static bool GetAuthentication(OSHttpRequest httpRequest, out string authority, out string authKey)
+        public static bool GetAuthentication(OSHttpRequest httpRequest, out string authority, out string authKey)
-        {
+        {
-            authority = string.Empty;
+            authority = string.Empty;
-            authKey = string.Empty;
+            authKey = string.Empty;
-            Uri authUri;
+            Uri authUri;
-            string auth = httpRequest.Headers["authentication"];
+            string auth = httpRequest.Headers["authentication"];
-            // Authentication keys look like this:
+            // Authentication keys look like this:
-            // http://orgrid.org:8002/<uuid>
+            // http://orgrid.org:8002/<uuid>
-            if ((auth != null) && (!string.Empty.Equals(auth)) && auth != "None")
+            if ((auth != null) && (!string.Empty.Equals(auth)) && auth != "None")
-            {
+            {
-                if (Uri.TryCreate(auth, UriKind.Absolute, out authUri))
+                if (Uri.TryCreate(auth, UriKind.Absolute, out authUri))
-                {
+                {
-                    authority = authUri.Authority;
+                    authority = authUri.Authority;
-                    authKey = authUri.PathAndQuery.Trim('/');
+                    authKey = authUri.PathAndQuery.Trim('/');
-                    return true;
+                    return true;
-                }
+                }
-            }
+            }
-            return false;
+            return false;
-        }
+        }
-    }
+    }
-}
+}
author	diva	2009-06-14 15:35:09 +0000
committer	diva	2009-06-14 15:35:09 +0000
commit	7a9c85526cb99495bdd436150679941ef021b782 (patch)
tree	888b5bdf86f8327d2df0c1ca8f1cd3dd999d125d /OpenSim/Server/Handlers/Base/Utils.cs
parent	* Temporarily resolve another problem in http://opensimulator.org/mantis/view... (diff)
download	opensim-SC-7a9c85526cb99495bdd436150679941ef021b782.zip opensim-SC-7a9c85526cb99495bdd436150679941ef021b782.tar.gz opensim-SC-7a9c85526cb99495bdd436150679941ef021b782.tar.bz2 opensim-SC-7a9c85526cb99495bdd436150679941ef021b782.tar.xz

diff --git a/OpenSim/Server/Handlers/Simulation/Utils.cs b/OpenSim/Server/Handlers/Base/Utils.cs index e21d1b8..f1610ff 100644 --- a/OpenSim/Server/Handlers/Simulation/Utils.cs +++ b/OpenSim/Server/Handlers/Base/Utils.cs
@@ -1,97 +1,97 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSimulator Project nor the	12	* * Neither the name of the OpenSimulator Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*/	26	*/
27		27
28	using System;	28	using System;
29	using System.Collections;	29	using System.Collections;
30	using System.Net;	30	using System.Net;
31		31
32	using OpenSim.Framework;	32	using OpenSim.Framework;
33	using OpenSim.Framework.Servers.HttpServer;	33	using OpenSim.Framework.Servers.HttpServer;
34	using OpenSim.Services.Interfaces;	34	using OpenSim.Services.Interfaces;
35	using OpenMetaverse;	35	using OpenMetaverse;
36		36
37	namespace OpenSim.Server.Handlers.Simulation	37	namespace OpenSim.Server.Handlers.Base
38	{	38	{
39	public class Utils	39	public class RestHandlerUtils
40	{	40	{
41	/// <summary>	41	/// <summary>
42	/// Extract the param from an uri.	42	/// Extract the param from an uri.
43	/// </summary>	43	/// </summary>
44	/// <param name="uri">Something like this: /uuid/ or /uuid/handle/release</param>	44	/// <param name="uri">Something like this: /uuid/ or /uuid/handle/release</param>
45	/// <param name="uri">uuid on uuid field</param>	45	/// <param name="uri">uuid on uuid field</param>
46	/// <param name="action">optional action</param>	46	/// <param name="action">optional action</param>
47	public static bool GetParams(string path, out UUID uuid, out ulong regionHandle, out string action)	47	public static bool GetParams(string path, out UUID uuid, out ulong regionHandle, out string action)
48	{	48	{
49	uuid = UUID.Zero;	49	uuid = UUID.Zero;
50	action = "";	50	action = "";
51	regionHandle = 0;	51	regionHandle = 0;
52		52
53	path = path.Trim(new char[] { '/' });	53	path = path.Trim(new char[] { '/' });
54	string[] parts = path.Split('/');	54	string[] parts = path.Split('/');
55	if (parts.Length <= 1)	55	if (parts.Length <= 1)
56	{	56	{
57	return false;	57	return false;
58	}	58	}
59	else	59	else
60	{	60	{
61	if (!UUID.TryParse(parts[0], out uuid))	61	if (!UUID.TryParse(parts[0], out uuid))
62	return false;	62	return false;
63		63
64	if (parts.Length >= 2)	64	if (parts.Length >= 2)
65	UInt64.TryParse(parts[1], out regionHandle);	65	UInt64.TryParse(parts[1], out regionHandle);
66	if (parts.Length >= 3)	66	if (parts.Length >= 3)
67	action = parts[2];	67	action = parts[2];
68		68
69	return true;	69	return true;
70	}	70	}
71	}	71	}
72		72
73	public static bool GetAuthentication(OSHttpRequest httpRequest, out string authority, out string authKey)	73	public static bool GetAuthentication(OSHttpRequest httpRequest, out string authority, out string authKey)
74	{	74	{
75	authority = string.Empty;	75	authority = string.Empty;
76	authKey = string.Empty;	76	authKey = string.Empty;
77		77
78	Uri authUri;	78	Uri authUri;
79		79
80	string auth = httpRequest.Headers["authentication"];	80	string auth = httpRequest.Headers["authentication"];
81	// Authentication keys look like this:	81	// Authentication keys look like this:
82	// http://orgrid.org:8002/<uuid>	82	// http://orgrid.org:8002/<uuid>
83	if ((auth != null) && (!string.Empty.Equals(auth)) && auth != "None")	83	if ((auth != null) && (!string.Empty.Equals(auth)) && auth != "None")
84	{	84	{
85	if (Uri.TryCreate(auth, UriKind.Absolute, out authUri))	85	if (Uri.TryCreate(auth, UriKind.Absolute, out authUri))
86	{	86	{
87	authority = authUri.Authority;	87	authority = authUri.Authority;
88	authKey = authUri.PathAndQuery.Trim('/');	88	authKey = authUri.PathAndQuery.Trim('/');
89	return true;	89	return true;
90	}	90	}
91	}	91	}
92		92
93	return false;	93	return false;
94	}	94	}
95		95
96	}	96	}
97	}	97	}