1 files changed, 138 insertions, 138 deletions
diff --git a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
index 6c916a2..989df26 100644
--- a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
+++ b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
@@ -1,138 +1,138 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim Project nor the
+*     * Neither the name of the OpenSim 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.Collections;
+using System.Collections;
-using libsecondlife;
+using libsecondlife;
-using Nwc.XmlRpc;
+using Nwc.XmlRpc;
-using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers;
-namespace OpenSim.Framework.Manager
+namespace OpenSim.Framework.Manager
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Used to pass messages to the gridserver
+    /// Used to pass messages to the gridserver
-    /// </summary>
+    /// </summary>
-    /// <param name="param">Pass this argument</param>
+    /// <param name="param">Pass this argument</param>
-    public delegate void GridManagerCallback(string param);
+    public delegate void GridManagerCallback(string param);
-    /// <summary>
+    /// <summary>
-    /// Serverside listener for grid commands
+    /// Serverside listener for grid commands
-    /// </summary>
+    /// </summary>
-    public class GridManagementAgent
+    public class GridManagementAgent
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// Passes grid server messages
+        /// Passes grid server messages
-        /// </summary>
+        /// </summary>
-        private GridManagerCallback thecallback;
+        private GridManagerCallback thecallback;
-        /// <summary>
+        /// <summary>
-        /// Security keys
+        /// Security keys
-        /// </summary>
+        /// </summary>
-        private string sendkey;
+        private string sendkey;
-        private string recvkey;
+        private string recvkey;
-        /// <summary>
+        /// <summary>
-        /// Our component type
+        /// Our component type
-        /// </summary>
+        /// </summary>
-        private string component_type;
+        private string component_type;
-        /// <summary>
+        /// <summary>
-        /// List of active sessions
+        /// List of active sessions
-        /// </summary>
+        /// </summary>
-        private static ArrayList Sessions;
+        private static ArrayList Sessions;
-        /// <summary>
+        /// <summary>
-        /// Initialises a new GridManagementAgent
+        /// Initialises a new GridManagementAgent
-        /// </summary>
+        /// </summary>
-        /// <param name="app_httpd">HTTP Daemon for this server</param>
+        /// <param name="app_httpd">HTTP Daemon for this server</param>
-        /// <param name="component_type">What component type are we?</param>
+        /// <param name="component_type">What component type are we?</param>
-        /// <param name="sendkey">Security send key</param>
+        /// <param name="sendkey">Security send key</param>
-        /// <param name="recvkey">Security recieve key</param>
+        /// <param name="recvkey">Security recieve key</param>
-        /// <param name="thecallback">Message callback</param>
+        /// <param name="thecallback">Message callback</param>
-        public GridManagementAgent(BaseHttpServer app_httpd, string component_type, string sendkey, string recvkey, GridManagerCallback thecallback)
+        public GridManagementAgent(BaseHttpServer app_httpd, string component_type, string sendkey, string recvkey, GridManagerCallback thecallback)
-        {
+        {
-            this.sendkey = sendkey;
+            this.sendkey = sendkey;
-            this.recvkey = recvkey;
+            this.recvkey = recvkey;
-            this.component_type = component_type;
+            this.component_type = component_type;
-            this.thecallback = thecallback;
+            this.thecallback = thecallback;
-            Sessions = new ArrayList();
+            Sessions = new ArrayList();
-            app_httpd.AddXmlRPCHandler("manager_login", XmlRpcLoginMethod);
+            app_httpd.AddXmlRPCHandler("manager_login", XmlRpcLoginMethod);
-            switch (component_type)
+            switch (component_type)
-            {
+            {
-                case "gridserver":
+                case "gridserver":
-                    GridServerManager.sendkey = this.sendkey;
+                    GridServerManager.sendkey = this.sendkey;
-                    GridServerManager.recvkey = this.recvkey;
+                    GridServerManager.recvkey = this.recvkey;
-                    GridServerManager.thecallback = thecallback;
+                    GridServerManager.thecallback = thecallback;
-                    app_httpd.AddXmlRPCHandler("shutdown", GridServerManager.XmlRpcShutdownMethod);
+                    app_httpd.AddXmlRPCHandler("shutdown", GridServerManager.XmlRpcShutdownMethod);
-                    break;
+                    break;
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Checks if a session exists
+        /// Checks if a session exists
-        /// </summary>
+        /// </summary>
-        /// <param name="sessionID">The session ID</param>
+        /// <param name="sessionID">The session ID</param>
-        /// <returns>Exists?</returns>
+        /// <returns>Exists?</returns>
-        public static bool SessionExists(LLUUID sessionID)
+        public static bool SessionExists(LLUUID sessionID)
-        {
+        {
-            return Sessions.Contains(sessionID);
+            return Sessions.Contains(sessionID);
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Logs a new session to the grid manager
+        /// Logs a new session to the grid manager
-        /// </summary>
+        /// </summary>
-        /// <param name="request">the XMLRPC request</param>
+        /// <param name="request">the XMLRPC request</param>
-        /// <returns>An XMLRPC reply</returns>
+        /// <returns>An XMLRPC reply</returns>
-        public static XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
+        public static XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
-        {
+        {
-            XmlRpcResponse response = new XmlRpcResponse();
+            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable requestData = (Hashtable)request.Params[0];
+            Hashtable requestData = (Hashtable)request.Params[0];
-            Hashtable responseData = new Hashtable();
+            Hashtable responseData = new Hashtable();
-            // TODO: Switch this over to using OpenSim.Framework.Data
+            // TODO: Switch this over to using OpenSim.Framework.Data
-            if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))
+            if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))
-            {
+            {
-                response.IsFault = false;
+                response.IsFault = false;
-                LLUUID new_session = LLUUID.Random();
+                LLUUID new_session = LLUUID.Random();
-                Sessions.Add(new_session);
+                Sessions.Add(new_session);
-                responseData["session_id"] = new_session.ToString();
+                responseData["session_id"] = new_session.ToString();
-                responseData["msg"] = "Login OK";
+                responseData["msg"] = "Login OK";
-            }
+            }
-            else
+            else
-            {
+            {
-                response.IsFault = true;
+                response.IsFault = true;
-                responseData["error"] = "Invalid username or password";
+                responseData["error"] = "Invalid username or password";
-            }
+            }
-            response.Value = responseData;
+            response.Value = responseData;
-            return response;
+            return response;
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs index 6c916a2..989df26 100644 --- a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs +++ b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
@@ -1,138 +1,138 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://www.openmetaverse.org/	2	* Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim Project nor the	12	* * Neither the name of the OpenSim 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.Collections;	28	using System.Collections;
29	using libsecondlife;	29	using libsecondlife;
30	using Nwc.XmlRpc;	30	using Nwc.XmlRpc;
31	using OpenSim.Framework.Servers;	31	using OpenSim.Framework.Servers;
32		32
33	namespace OpenSim.Framework.Manager	33	namespace OpenSim.Framework.Manager
34	{	34	{
35	/// <summary>	35	/// <summary>
36	/// Used to pass messages to the gridserver	36	/// Used to pass messages to the gridserver
37	/// </summary>	37	/// </summary>
38	/// <param name="param">Pass this argument</param>	38	/// <param name="param">Pass this argument</param>
39	public delegate void GridManagerCallback(string param);	39	public delegate void GridManagerCallback(string param);
40		40
41	/// <summary>	41	/// <summary>
42	/// Serverside listener for grid commands	42	/// Serverside listener for grid commands
43	/// </summary>	43	/// </summary>
44	public class GridManagementAgent	44	public class GridManagementAgent
45	{	45	{
46	/// <summary>	46	/// <summary>
47	/// Passes grid server messages	47	/// Passes grid server messages
48	/// </summary>	48	/// </summary>
49	private GridManagerCallback thecallback;	49	private GridManagerCallback thecallback;
50		50
51	/// <summary>	51	/// <summary>
52	/// Security keys	52	/// Security keys
53	/// </summary>	53	/// </summary>
54	private string sendkey;	54	private string sendkey;
55	private string recvkey;	55	private string recvkey;
56		56
57	/// <summary>	57	/// <summary>
58	/// Our component type	58	/// Our component type
59	/// </summary>	59	/// </summary>
60	private string component_type;	60	private string component_type;
61		61
62	/// <summary>	62	/// <summary>
63	/// List of active sessions	63	/// List of active sessions
64	/// </summary>	64	/// </summary>
65	private static ArrayList Sessions;	65	private static ArrayList Sessions;
66		66
67	/// <summary>	67	/// <summary>
68	/// Initialises a new GridManagementAgent	68	/// Initialises a new GridManagementAgent
69	/// </summary>	69	/// </summary>
70	/// <param name="app_httpd">HTTP Daemon for this server</param>	70	/// <param name="app_httpd">HTTP Daemon for this server</param>
71	/// <param name="component_type">What component type are we?</param>	71	/// <param name="component_type">What component type are we?</param>
72	/// <param name="sendkey">Security send key</param>	72	/// <param name="sendkey">Security send key</param>
73	/// <param name="recvkey">Security recieve key</param>	73	/// <param name="recvkey">Security recieve key</param>
74	/// <param name="thecallback">Message callback</param>	74	/// <param name="thecallback">Message callback</param>
75	public GridManagementAgent(BaseHttpServer app_httpd, string component_type, string sendkey, string recvkey, GridManagerCallback thecallback)	75	public GridManagementAgent(BaseHttpServer app_httpd, string component_type, string sendkey, string recvkey, GridManagerCallback thecallback)
76	{	76	{
77	this.sendkey = sendkey;	77	this.sendkey = sendkey;
78	this.recvkey = recvkey;	78	this.recvkey = recvkey;
79	this.component_type = component_type;	79	this.component_type = component_type;
80	this.thecallback = thecallback;	80	this.thecallback = thecallback;
81	Sessions = new ArrayList();	81	Sessions = new ArrayList();
82		82
83	app_httpd.AddXmlRPCHandler("manager_login", XmlRpcLoginMethod);	83	app_httpd.AddXmlRPCHandler("manager_login", XmlRpcLoginMethod);
84		84
85	switch (component_type)	85	switch (component_type)
86	{	86	{
87	case "gridserver":	87	case "gridserver":
88	GridServerManager.sendkey = this.sendkey;	88	GridServerManager.sendkey = this.sendkey;
89	GridServerManager.recvkey = this.recvkey;	89	GridServerManager.recvkey = this.recvkey;
90	GridServerManager.thecallback = thecallback;	90	GridServerManager.thecallback = thecallback;
91	app_httpd.AddXmlRPCHandler("shutdown", GridServerManager.XmlRpcShutdownMethod);	91	app_httpd.AddXmlRPCHandler("shutdown", GridServerManager.XmlRpcShutdownMethod);
92	break;	92	break;
93	}	93	}
94	}	94	}
95		95
96	/// <summary>	96	/// <summary>
97	/// Checks if a session exists	97	/// Checks if a session exists
98	/// </summary>	98	/// </summary>
99	/// <param name="sessionID">The session ID</param>	99	/// <param name="sessionID">The session ID</param>
100	/// <returns>Exists?</returns>	100	/// <returns>Exists?</returns>
101	public static bool SessionExists(LLUUID sessionID)	101	public static bool SessionExists(LLUUID sessionID)
102	{	102	{
103	return Sessions.Contains(sessionID);	103	return Sessions.Contains(sessionID);
104	}	104	}
105		105
106	/// <summary>	106	/// <summary>
107	/// Logs a new session to the grid manager	107	/// Logs a new session to the grid manager
108	/// </summary>	108	/// </summary>
109	/// <param name="request">the XMLRPC request</param>	109	/// <param name="request">the XMLRPC request</param>
110	/// <returns>An XMLRPC reply</returns>	110	/// <returns>An XMLRPC reply</returns>
111	public static XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)	111	public static XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
112	{	112	{
113	XmlRpcResponse response = new XmlRpcResponse();	113	XmlRpcResponse response = new XmlRpcResponse();
114	Hashtable requestData = (Hashtable)request.Params[0];	114	Hashtable requestData = (Hashtable)request.Params[0];
115	Hashtable responseData = new Hashtable();	115	Hashtable responseData = new Hashtable();
116		116
117	// TODO: Switch this over to using OpenSim.Framework.Data	117	// TODO: Switch this over to using OpenSim.Framework.Data
118	if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))	118	if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))
119	{	119	{
120	response.IsFault = false;	120	response.IsFault = false;
121	LLUUID new_session = LLUUID.Random();	121	LLUUID new_session = LLUUID.Random();
122	Sessions.Add(new_session);	122	Sessions.Add(new_session);
123	responseData["session_id"] = new_session.ToString();	123	responseData["session_id"] = new_session.ToString();
124	responseData["msg"] = "Login OK";	124	responseData["msg"] = "Login OK";
125	}	125	}
126	else	126	else
127	{	127	{
128	response.IsFault = true;	128	response.IsFault = true;
129	responseData["error"] = "Invalid username or password";	129	responseData["error"] = "Invalid username or password";
130	}	130	}
131		131
132	response.Value = responseData;	132	response.Value = responseData;
133	return response;	133	return response;
134		134
135	}	135	}
136		136
137	}	137	}
138	}	138	}