1 files changed, 93 insertions, 93 deletions
diff --git a/OpenSim/Grid/Framework.Manager/GridServerManager.cs b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
index 67cd35d..729e42b 100644
--- a/OpenSim/Grid/Framework.Manager/GridServerManager.cs
+++ b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
@@ -1,93 +1,93 @@
-/*
+/*
-* 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;
+using System;
-using System.Collections;
+using System.Collections;
-using System.Threading;
+using System.Threading;
-using libsecondlife;
+using libsecondlife;
-using Nwc.XmlRpc;
+using Nwc.XmlRpc;
-namespace OpenSim.Framework.Manager {
+namespace OpenSim.Framework.Manager {
-    /// <summary>
+    /// <summary>
-    /// A remote management system for the grid server
+    /// A remote management system for the grid server
-    /// </summary>
+    /// </summary>
-        public class GridServerManager 
+        public class GridServerManager 
-        {
+        {
-        /// <summary>
+        /// <summary>
-        /// Triggers events from the grid manager
+        /// Triggers events from the grid manager
-        /// </summary>
+        /// </summary>
-                public static GridManagerCallback thecallback;
+                public static GridManagerCallback thecallback;
-        /// <summary>
+        /// <summary>
-        /// Security keys
+        /// Security keys
-        /// </summary>
+        /// </summary>
-                public static string sendkey;
+                public static string sendkey;
-                public static string recvkey;
+                public static string recvkey;
-        /// <summary>
+        /// <summary>
-        /// Disconnects the grid server and shuts it down
+        /// Disconnects the grid server and shuts it down
-        /// </summary>
+        /// </summary>
-        /// <param name="request">XmlRpc Request</param>
+        /// <param name="request">XmlRpc Request</param>
-        /// <returns>An XmlRpc response containing either a "msg" or an "error"</returns>
+        /// <returns>An XmlRpc response containing either a "msg" or an "error"</returns>
-                public static XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request)
+                public static XmlRpcResponse XmlRpcShutdownMethod(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();
-         
+         
-                        if(requestData.ContainsKey("session_id")) {
+                        if(requestData.ContainsKey("session_id")) {
-                                if(GridManagementAgent.SessionExists(new LLUUID((string)requestData["session_id"]))) {
+                                if(GridManagementAgent.SessionExists(new LLUUID((string)requestData["session_id"]))) {
-                                        responseData["msg"]="Shutdown command accepted";
+                                        responseData["msg"]="Shutdown command accepted";
-                                        (new Thread(new ThreadStart(ShutdownServer))).Start();
+                                        (new Thread(new ThreadStart(ShutdownServer))).Start();
-                                } else {
+                                } else {
-                                        response.IsFault=true;
+                                        response.IsFault=true;
-                                        responseData["error"]="bad session ID";
+                                        responseData["error"]="bad session ID";
-                                }
+                                }
-                        } else {
+                        } else {
-                                response.IsFault=true;
+                                response.IsFault=true;
-                                responseData["error"]="no session ID";
+                                responseData["error"]="no session ID";
-                        }
+                        }
-                        response.Value = responseData;
+                        response.Value = responseData;
-                        return response;
+                        return response;
-                }
+                }
-                /// <summary>
+                /// <summary>
-        /// Shuts down the grid server
+        /// Shuts down the grid server
-                /// </summary>
+                /// </summary>
-                public static void ShutdownServer()
+                public static void ShutdownServer()
-                {
+                {
-                        Console.WriteLine("Shutting down the grid server - recieved a grid manager request");
+                        Console.WriteLine("Shutting down the grid server - recieved a grid manager request");
-            Console.WriteLine("Terminating in three seconds...");
+            Console.WriteLine("Terminating in three seconds...");
-                        Thread.Sleep(3000);
+                        Thread.Sleep(3000);
-                        thecallback("shutdown");
+                        thecallback("shutdown");
-                }
+                }
-         }
+         }
-}
+}

diff --git a/OpenSim/Grid/Framework.Manager/GridServerManager.cs b/OpenSim/Grid/Framework.Manager/GridServerManager.cs index 67cd35d..729e42b 100644 --- a/OpenSim/Grid/Framework.Manager/GridServerManager.cs +++ b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
@@ -1,93 +1,93 @@
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		28
29	using System;	29	using System;
30	using System.Collections;	30	using System.Collections;
31	using System.Threading;	31	using System.Threading;
32	using libsecondlife;	32	using libsecondlife;
33	using Nwc.XmlRpc;	33	using Nwc.XmlRpc;
34		34
35	namespace OpenSim.Framework.Manager {	35	namespace OpenSim.Framework.Manager {
36		36
37	/// <summary>	37	/// <summary>
38	/// A remote management system for the grid server	38	/// A remote management system for the grid server
39	/// </summary>	39	/// </summary>
40	public class GridServerManager	40	public class GridServerManager
41	{	41	{
42	/// <summary>	42	/// <summary>
43	/// Triggers events from the grid manager	43	/// Triggers events from the grid manager
44	/// </summary>	44	/// </summary>
45	public static GridManagerCallback thecallback;	45	public static GridManagerCallback thecallback;
46		46
47	/// <summary>	47	/// <summary>
48	/// Security keys	48	/// Security keys
49	/// </summary>	49	/// </summary>
50	public static string sendkey;	50	public static string sendkey;
51	public static string recvkey;	51	public static string recvkey;
52		52
53	/// <summary>	53	/// <summary>
54	/// Disconnects the grid server and shuts it down	54	/// Disconnects the grid server and shuts it down
55	/// </summary>	55	/// </summary>
56	/// <param name="request">XmlRpc Request</param>	56	/// <param name="request">XmlRpc Request</param>
57	/// <returns>An XmlRpc response containing either a "msg" or an "error"</returns>	57	/// <returns>An XmlRpc response containing either a "msg" or an "error"</returns>
58	public static XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request)	58	public static XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request)
59	{	59	{
60	XmlRpcResponse response = new XmlRpcResponse();	60	XmlRpcResponse response = new XmlRpcResponse();
61	Hashtable requestData = (Hashtable)request.Params[0];	61	Hashtable requestData = (Hashtable)request.Params[0];
62	Hashtable responseData = new Hashtable();	62	Hashtable responseData = new Hashtable();
63		63
64	if(requestData.ContainsKey("session_id")) {	64	if(requestData.ContainsKey("session_id")) {
65	if(GridManagementAgent.SessionExists(new LLUUID((string)requestData["session_id"]))) {	65	if(GridManagementAgent.SessionExists(new LLUUID((string)requestData["session_id"]))) {
66	responseData["msg"]="Shutdown command accepted";	66	responseData["msg"]="Shutdown command accepted";
67	(new Thread(new ThreadStart(ShutdownServer))).Start();	67	(new Thread(new ThreadStart(ShutdownServer))).Start();
68	} else {	68	} else {
69	response.IsFault=true;	69	response.IsFault=true;
70	responseData["error"]="bad session ID";	70	responseData["error"]="bad session ID";
71	}	71	}
72	} else {	72	} else {
73	response.IsFault=true;	73	response.IsFault=true;
74	responseData["error"]="no session ID";	74	responseData["error"]="no session ID";
75	}	75	}
76		76
77	response.Value = responseData;	77	response.Value = responseData;
78	return response;	78	return response;
79	}	79	}
80		80
81	/// <summary>	81	/// <summary>
82	/// Shuts down the grid server	82	/// Shuts down the grid server
83	/// </summary>	83	/// </summary>
84	public static void ShutdownServer()	84	public static void ShutdownServer()
85	{	85	{
86	Console.WriteLine("Shutting down the grid server - recieved a grid manager request");	86	Console.WriteLine("Shutting down the grid server - recieved a grid manager request");
87	Console.WriteLine("Terminating in three seconds...");	87	Console.WriteLine("Terminating in three seconds...");
88	Thread.Sleep(3000);	88	Thread.Sleep(3000);
89	thecallback("shutdown");	89	thecallback("shutdown");
90	}	90	}
91	}	91	}
92	}	92	}
93		93