diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/Framework.Manager/GridManagementAgent.cs | 138 | ||||
-rw-r--r-- | OpenSim/Grid/Framework.Manager/GridServerManager.cs | 93 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 3 |
3 files changed, 0 insertions, 234 deletions
diff --git a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs deleted file mode 100644 index 989df26..0000000 --- a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs +++ /dev/null | |||
@@ -1,138 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
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 | ||
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 | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System.Collections; | ||
29 | using libsecondlife; | ||
30 | using Nwc.XmlRpc; | ||
31 | using OpenSim.Framework.Servers; | ||
32 | |||
33 | namespace OpenSim.Framework.Manager | ||
34 | { | ||
35 | /// <summary> | ||
36 | /// Used to pass messages to the gridserver | ||
37 | /// </summary> | ||
38 | /// <param name="param">Pass this argument</param> | ||
39 | public delegate void GridManagerCallback(string param); | ||
40 | |||
41 | /// <summary> | ||
42 | /// Serverside listener for grid commands | ||
43 | /// </summary> | ||
44 | public class GridManagementAgent | ||
45 | { | ||
46 | /// <summary> | ||
47 | /// Passes grid server messages | ||
48 | /// </summary> | ||
49 | private GridManagerCallback thecallback; | ||
50 | |||
51 | /// <summary> | ||
52 | /// Security keys | ||
53 | /// </summary> | ||
54 | private string sendkey; | ||
55 | private string recvkey; | ||
56 | |||
57 | /// <summary> | ||
58 | /// Our component type | ||
59 | /// </summary> | ||
60 | private string component_type; | ||
61 | |||
62 | /// <summary> | ||
63 | /// List of active sessions | ||
64 | /// </summary> | ||
65 | private static ArrayList Sessions; | ||
66 | |||
67 | /// <summary> | ||
68 | /// Initialises a new GridManagementAgent | ||
69 | /// </summary> | ||
70 | /// <param name="app_httpd">HTTP Daemon for this server</param> | ||
71 | /// <param name="component_type">What component type are we?</param> | ||
72 | /// <param name="sendkey">Security send key</param> | ||
73 | /// <param name="recvkey">Security recieve key</param> | ||
74 | /// <param name="thecallback">Message callback</param> | ||
75 | public GridManagementAgent(BaseHttpServer app_httpd, string component_type, string sendkey, string recvkey, GridManagerCallback thecallback) | ||
76 | { | ||
77 | this.sendkey = sendkey; | ||
78 | this.recvkey = recvkey; | ||
79 | this.component_type = component_type; | ||
80 | this.thecallback = thecallback; | ||
81 | Sessions = new ArrayList(); | ||
82 | |||
83 | app_httpd.AddXmlRPCHandler("manager_login", XmlRpcLoginMethod); | ||
84 | |||
85 | switch (component_type) | ||
86 | { | ||
87 | case "gridserver": | ||
88 | GridServerManager.sendkey = this.sendkey; | ||
89 | GridServerManager.recvkey = this.recvkey; | ||
90 | GridServerManager.thecallback = thecallback; | ||
91 | app_httpd.AddXmlRPCHandler("shutdown", GridServerManager.XmlRpcShutdownMethod); | ||
92 | break; | ||
93 | } | ||
94 | } | ||
95 | |||
96 | /// <summary> | ||
97 | /// Checks if a session exists | ||
98 | /// </summary> | ||
99 | /// <param name="sessionID">The session ID</param> | ||
100 | /// <returns>Exists?</returns> | ||
101 | public static bool SessionExists(LLUUID sessionID) | ||
102 | { | ||
103 | return Sessions.Contains(sessionID); | ||
104 | } | ||
105 | |||
106 | /// <summary> | ||
107 | /// Logs a new session to the grid manager | ||
108 | /// </summary> | ||
109 | /// <param name="request">the XMLRPC request</param> | ||
110 | /// <returns>An XMLRPC reply</returns> | ||
111 | public static XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) | ||
112 | { | ||
113 | XmlRpcResponse response = new XmlRpcResponse(); | ||
114 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
115 | Hashtable responseData = new Hashtable(); | ||
116 | |||
117 | // TODO: Switch this over to using OpenSim.Framework.Data | ||
118 | if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret")) | ||
119 | { | ||
120 | response.IsFault = false; | ||
121 | LLUUID new_session = LLUUID.Random(); | ||
122 | Sessions.Add(new_session); | ||
123 | responseData["session_id"] = new_session.ToString(); | ||
124 | responseData["msg"] = "Login OK"; | ||
125 | } | ||
126 | else | ||
127 | { | ||
128 | response.IsFault = true; | ||
129 | responseData["error"] = "Invalid username or password"; | ||
130 | } | ||
131 | |||
132 | response.Value = responseData; | ||
133 | return response; | ||
134 | |||
135 | } | ||
136 | |||
137 | } | ||
138 | } | ||
diff --git a/OpenSim/Grid/Framework.Manager/GridServerManager.cs b/OpenSim/Grid/Framework.Manager/GridServerManager.cs deleted file mode 100644 index 729e42b..0000000 --- a/OpenSim/Grid/Framework.Manager/GridServerManager.cs +++ /dev/null | |||
@@ -1,93 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
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 | ||
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 | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | |||
29 | using System; | ||
30 | using System.Collections; | ||
31 | using System.Threading; | ||
32 | using libsecondlife; | ||
33 | using Nwc.XmlRpc; | ||
34 | |||
35 | namespace OpenSim.Framework.Manager { | ||
36 | |||
37 | /// <summary> | ||
38 | /// A remote management system for the grid server | ||
39 | /// </summary> | ||
40 | public class GridServerManager | ||
41 | { | ||
42 | /// <summary> | ||
43 | /// Triggers events from the grid manager | ||
44 | /// </summary> | ||
45 | public static GridManagerCallback thecallback; | ||
46 | |||
47 | /// <summary> | ||
48 | /// Security keys | ||
49 | /// </summary> | ||
50 | public static string sendkey; | ||
51 | public static string recvkey; | ||
52 | |||
53 | /// <summary> | ||
54 | /// Disconnects the grid server and shuts it down | ||
55 | /// </summary> | ||
56 | /// <param name="request">XmlRpc Request</param> | ||
57 | /// <returns>An XmlRpc response containing either a "msg" or an "error"</returns> | ||
58 | public static XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request) | ||
59 | { | ||
60 | XmlRpcResponse response = new XmlRpcResponse(); | ||
61 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
62 | Hashtable responseData = new Hashtable(); | ||
63 | |||
64 | if(requestData.ContainsKey("session_id")) { | ||
65 | if(GridManagementAgent.SessionExists(new LLUUID((string)requestData["session_id"]))) { | ||
66 | responseData["msg"]="Shutdown command accepted"; | ||
67 | (new Thread(new ThreadStart(ShutdownServer))).Start(); | ||
68 | } else { | ||
69 | response.IsFault=true; | ||
70 | responseData["error"]="bad session ID"; | ||
71 | } | ||
72 | } else { | ||
73 | response.IsFault=true; | ||
74 | responseData["error"]="no session ID"; | ||
75 | } | ||
76 | |||
77 | response.Value = responseData; | ||
78 | return response; | ||
79 | } | ||
80 | |||
81 | /// <summary> | ||
82 | /// Shuts down the grid server | ||
83 | /// </summary> | ||
84 | public static void ShutdownServer() | ||
85 | { | ||
86 | Console.WriteLine("Shutting down the grid server - recieved a grid manager request"); | ||
87 | Console.WriteLine("Terminating in three seconds..."); | ||
88 | Thread.Sleep(3000); | ||
89 | thecallback("shutdown"); | ||
90 | } | ||
91 | } | ||
92 | } | ||
93 | |||
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 82bbd57..289f77a 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -34,7 +34,6 @@ using libsecondlife; | |||
34 | using OpenSim.Framework.Console; | 34 | using OpenSim.Framework.Console; |
35 | using OpenSim.Framework.Interfaces; | 35 | using OpenSim.Framework.Interfaces; |
36 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Framework.User; | ||
38 | using OpenSim.Framework.Utilities; | 37 | using OpenSim.Framework.Utilities; |
39 | using OpenSim.Framework.Configuration; | 38 | using OpenSim.Framework.Configuration; |
40 | 39 | ||
@@ -49,8 +48,6 @@ namespace OpenSim.Grid.UserServer | |||
49 | public UserManager m_userManager; | 48 | public UserManager m_userManager; |
50 | public UserLoginService m_loginService; | 49 | public UserLoginService m_loginService; |
51 | 50 | ||
52 | public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>(); | ||
53 | |||
54 | LogBase m_console; | 51 | LogBase m_console; |
55 | 52 | ||
56 | [STAThread] | 53 | [STAThread] |