diff options
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/MessagingServer/IMessageRegionService.cs | 49 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/IMessageUserServerService.cs | 43 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/IUGAIMCore.cs | 57 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/MessageRegionModule.cs | 424 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/MessageUserServerModule.cs | 370 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/UserDataBaseService.cs | 150 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserDataBaseService.cs | 136 |
7 files changed, 655 insertions, 574 deletions
diff --git a/OpenSim/Grid/MessagingServer/IMessageRegionService.cs b/OpenSim/Grid/MessagingServer/IMessageRegionService.cs index 907e89d..e203c98 100644 --- a/OpenSim/Grid/MessagingServer/IMessageRegionService.cs +++ b/OpenSim/Grid/MessagingServer/IMessageRegionService.cs | |||
@@ -1,11 +1,38 @@ | |||
1 | using System; | 1 | /* |
2 | using OpenSim.Data; | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | |
4 | namespace OpenSim.Grid.MessagingServer | 4 | * |
5 | { | 5 | * Redistribution and use in source and binary forms, with or without |
6 | public interface IMessageRegionService | 6 | * modification, are permitted provided that the following conditions are met: |
7 | { | 7 | * * Redistributions of source code must retain the above copyright |
8 | int ClearRegionCache(); | 8 | * notice, this list of conditions and the following disclaimer. |
9 | RegionProfileData GetRegionInfo(ulong regionhandle); | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | } | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | } | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSimulator 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; | ||
29 | using OpenSim.Data; | ||
30 | |||
31 | namespace OpenSim.Grid.MessagingServer | ||
32 | { | ||
33 | public interface IMessageRegionService | ||
34 | { | ||
35 | int ClearRegionCache(); | ||
36 | RegionProfileData GetRegionInfo(ulong regionhandle); | ||
37 | } | ||
38 | } | ||
diff --git a/OpenSim/Grid/MessagingServer/IMessageUserServerService.cs b/OpenSim/Grid/MessagingServer/IMessageUserServerService.cs index dff2052..2abbc41 100644 --- a/OpenSim/Grid/MessagingServer/IMessageUserServerService.cs +++ b/OpenSim/Grid/MessagingServer/IMessageUserServerService.cs | |||
@@ -1,8 +1,35 @@ | |||
1 | using System; | 1 | /* |
2 | namespace OpenSim.Grid.MessagingServer | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | { | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | public interface IMessageUserServerService | 4 | * |
5 | { | 5 | * Redistribution and use in source and binary forms, with or without |
6 | bool SendToUserServer(System.Collections.Hashtable request, string method); | 6 | * modification, are permitted provided that the following conditions are met: |
7 | } | 7 | * * Redistributions of source code must retain the above copyright |
8 | } | 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 OpenSimulator 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; | ||
29 | namespace OpenSim.Grid.MessagingServer | ||
30 | { | ||
31 | public interface IMessageUserServerService | ||
32 | { | ||
33 | bool SendToUserServer(System.Collections.Hashtable request, string method); | ||
34 | } | ||
35 | } | ||
diff --git a/OpenSim/Grid/MessagingServer/IUGAIMCore.cs b/OpenSim/Grid/MessagingServer/IUGAIMCore.cs index 5ab1166..4428205 100644 --- a/OpenSim/Grid/MessagingServer/IUGAIMCore.cs +++ b/OpenSim/Grid/MessagingServer/IUGAIMCore.cs | |||
@@ -1,15 +1,42 @@ | |||
1 | using System; | 1 | /* |
2 | using System.Collections.Generic; | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | using System.Text; | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | using OpenSim.Framework.Servers; | 4 | * |
5 | 5 | * Redistribution and use in source and binary forms, with or without | |
6 | namespace OpenSim.Grid.MessagingServer | 6 | * modification, are permitted provided that the following conditions are met: |
7 | { | 7 | * * Redistributions of source code must retain the above copyright |
8 | public interface IUGAIMCore | 8 | * notice, this list of conditions and the following disclaimer. |
9 | { | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | T Get<T>(); | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | void RegisterInterface<T>(T iface); | 11 | * documentation and/or other materials provided with the distribution. |
12 | bool TryGet<T>(out T iface); | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | BaseHttpServer GetHttpServer(); | 13 | * names of its contributors may be used to endorse or promote products |
14 | } | 14 | * derived from this software without specific prior written permission. |
15 | } | 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; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using OpenSim.Framework.Servers; | ||
32 | |||
33 | namespace OpenSim.Grid.MessagingServer | ||
34 | { | ||
35 | public interface IUGAIMCore | ||
36 | { | ||
37 | T Get<T>(); | ||
38 | void RegisterInterface<T>(T iface); | ||
39 | bool TryGet<T>(out T iface); | ||
40 | BaseHttpServer GetHttpServer(); | ||
41 | } | ||
42 | } | ||
diff --git a/OpenSim/Grid/MessagingServer/MessageRegionModule.cs b/OpenSim/Grid/MessagingServer/MessageRegionModule.cs index b3fd7ae..a2a7ade 100644 --- a/OpenSim/Grid/MessagingServer/MessageRegionModule.cs +++ b/OpenSim/Grid/MessagingServer/MessageRegionModule.cs | |||
@@ -1,212 +1,212 @@ | |||
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 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; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Net; | 31 | using System.Net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using System.Threading; | 33 | using System.Threading; |
34 | using System.Timers; | 34 | using System.Timers; |
35 | using log4net; | 35 | using log4net; |
36 | using Nwc.XmlRpc; | 36 | using Nwc.XmlRpc; |
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenSim.Data; | 38 | using OpenSim.Data; |
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using Timer = System.Timers.Timer; | 40 | using Timer = System.Timers.Timer; |
41 | 41 | ||
42 | namespace OpenSim.Grid.MessagingServer | 42 | namespace OpenSim.Grid.MessagingServer |
43 | { | 43 | { |
44 | public class MessageRegionModule : IMessageRegionService | 44 | public class MessageRegionModule : IMessageRegionService |
45 | { | 45 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | private MessageServerConfig m_cfg; | 48 | private MessageServerConfig m_cfg; |
49 | 49 | ||
50 | private IMessageUserServerService m_userServerModule; | 50 | private IMessageUserServerService m_userServerModule; |
51 | 51 | ||
52 | private IUGAIMCore m_messageCore; | 52 | private IUGAIMCore m_messageCore; |
53 | 53 | ||
54 | // a dictionary of all current regions this server knows about | 54 | // a dictionary of all current regions this server knows about |
55 | private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong, RegionProfileData>(); | 55 | private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong, RegionProfileData>(); |
56 | 56 | ||
57 | public MessageRegionModule(MessageServerConfig config, IUGAIMCore messageCore) | 57 | public MessageRegionModule(MessageServerConfig config, IUGAIMCore messageCore) |
58 | { | 58 | { |
59 | m_cfg = config; | 59 | m_cfg = config; |
60 | m_messageCore = messageCore; | 60 | m_messageCore = messageCore; |
61 | } | 61 | } |
62 | 62 | ||
63 | public void Initialise() | 63 | public void Initialise() |
64 | { | 64 | { |
65 | m_messageCore.RegisterInterface<IMessageRegionService>(this); | 65 | m_messageCore.RegisterInterface<IMessageRegionService>(this); |
66 | } | 66 | } |
67 | 67 | ||
68 | public void PostInitialise() | 68 | public void PostInitialise() |
69 | { | 69 | { |
70 | IMessageUserServerService messageUserServer; | 70 | IMessageUserServerService messageUserServer; |
71 | if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer)) | 71 | if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer)) |
72 | { | 72 | { |
73 | m_userServerModule = messageUserServer; | 73 | m_userServerModule = messageUserServer; |
74 | } | 74 | } |
75 | } | 75 | } |
76 | 76 | ||
77 | public void RegisterHandlers() | 77 | public void RegisterHandlers() |
78 | { | 78 | { |
79 | //have these in separate method as some servers restart the http server and reregister all the handlers. | 79 | //have these in separate method as some servers restart the http server and reregister all the handlers. |
80 | 80 | ||
81 | } | 81 | } |
82 | 82 | ||
83 | /// <summary> | 83 | /// <summary> |
84 | /// Gets and caches a RegionInfo object from the gridserver based on regionhandle | 84 | /// Gets and caches a RegionInfo object from the gridserver based on regionhandle |
85 | /// if the regionhandle is already cached, use the cached values | 85 | /// if the regionhandle is already cached, use the cached values |
86 | /// Gets called by lots of threads!!!!! | 86 | /// Gets called by lots of threads!!!!! |
87 | /// </summary> | 87 | /// </summary> |
88 | /// <param name="regionhandle">handle to the XY of the region we're looking for</param> | 88 | /// <param name="regionhandle">handle to the XY of the region we're looking for</param> |
89 | /// <returns>A RegionInfo object to stick in the presence info</returns> | 89 | /// <returns>A RegionInfo object to stick in the presence info</returns> |
90 | public RegionProfileData GetRegionInfo(ulong regionhandle) | 90 | public RegionProfileData GetRegionInfo(ulong regionhandle) |
91 | { | 91 | { |
92 | RegionProfileData regionInfo = null; | 92 | RegionProfileData regionInfo = null; |
93 | 93 | ||
94 | lock (m_regionInfoCache) | 94 | lock (m_regionInfoCache) |
95 | { | 95 | { |
96 | m_regionInfoCache.TryGetValue(regionhandle, out regionInfo); | 96 | m_regionInfoCache.TryGetValue(regionhandle, out regionInfo); |
97 | } | 97 | } |
98 | 98 | ||
99 | if (regionInfo == null) // not found in cache | 99 | if (regionInfo == null) // not found in cache |
100 | { | 100 | { |
101 | regionInfo = RequestRegionInfo(regionhandle); | 101 | regionInfo = RequestRegionInfo(regionhandle); |
102 | 102 | ||
103 | if (regionInfo != null) // lookup was successful | 103 | if (regionInfo != null) // lookup was successful |
104 | { | 104 | { |
105 | lock (m_regionInfoCache) | 105 | lock (m_regionInfoCache) |
106 | { | 106 | { |
107 | m_regionInfoCache[regionhandle] = regionInfo; | 107 | m_regionInfoCache[regionhandle] = regionInfo; |
108 | } | 108 | } |
109 | } | 109 | } |
110 | } | 110 | } |
111 | 111 | ||
112 | return regionInfo; | 112 | return regionInfo; |
113 | } | 113 | } |
114 | 114 | ||
115 | public int ClearRegionCache() | 115 | public int ClearRegionCache() |
116 | { | 116 | { |
117 | int cachecount = 0; | 117 | int cachecount = 0; |
118 | 118 | ||
119 | lock (m_regionInfoCache) | 119 | lock (m_regionInfoCache) |
120 | { | 120 | { |
121 | cachecount = m_regionInfoCache.Count; | 121 | cachecount = m_regionInfoCache.Count; |
122 | m_regionInfoCache.Clear(); | 122 | m_regionInfoCache.Clear(); |
123 | } | 123 | } |
124 | 124 | ||
125 | return cachecount; | 125 | return cachecount; |
126 | } | 126 | } |
127 | 127 | ||
128 | /// <summary> | 128 | /// <summary> |
129 | /// Get RegionProfileData from the GridServer. | 129 | /// Get RegionProfileData from the GridServer. |
130 | /// We'll cache this information in GetRegionInfo and use it for presence updates | 130 | /// We'll cache this information in GetRegionInfo and use it for presence updates |
131 | /// </summary> | 131 | /// </summary> |
132 | /// <param name="regionHandle"></param> | 132 | /// <param name="regionHandle"></param> |
133 | /// <returns></returns> | 133 | /// <returns></returns> |
134 | public RegionProfileData RequestRegionInfo(ulong regionHandle) | 134 | public RegionProfileData RequestRegionInfo(ulong regionHandle) |
135 | { | 135 | { |
136 | RegionProfileData regionProfile = null; | 136 | RegionProfileData regionProfile = null; |
137 | try | 137 | try |
138 | { | 138 | { |
139 | Hashtable requestData = new Hashtable(); | 139 | Hashtable requestData = new Hashtable(); |
140 | requestData["region_handle"] = regionHandle.ToString(); | 140 | requestData["region_handle"] = regionHandle.ToString(); |
141 | requestData["authkey"] = m_cfg.GridSendKey; | 141 | requestData["authkey"] = m_cfg.GridSendKey; |
142 | 142 | ||
143 | ArrayList SendParams = new ArrayList(); | 143 | ArrayList SendParams = new ArrayList(); |
144 | SendParams.Add(requestData); | 144 | SendParams.Add(requestData); |
145 | 145 | ||
146 | XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams); | 146 | XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams); |
147 | 147 | ||
148 | XmlRpcResponse GridResp = GridReq.Send(m_cfg.GridServerURL, 3000); | 148 | XmlRpcResponse GridResp = GridReq.Send(m_cfg.GridServerURL, 3000); |
149 | 149 | ||
150 | Hashtable responseData = (Hashtable)GridResp.Value; | 150 | Hashtable responseData = (Hashtable)GridResp.Value; |
151 | 151 | ||
152 | if (responseData.ContainsKey("error")) | 152 | if (responseData.ContainsKey("error")) |
153 | { | 153 | { |
154 | m_log.Error("[GRID]: error received from grid server" + responseData["error"]); | 154 | m_log.Error("[GRID]: error received from grid server" + responseData["error"]); |
155 | return null; | 155 | return null; |
156 | } | 156 | } |
157 | 157 | ||
158 | uint regX = Convert.ToUInt32((string)responseData["region_locx"]); | 158 | uint regX = Convert.ToUInt32((string)responseData["region_locx"]); |
159 | uint regY = Convert.ToUInt32((string)responseData["region_locy"]); | 159 | uint regY = Convert.ToUInt32((string)responseData["region_locy"]); |
160 | string internalIpStr = (string)responseData["sim_ip"]; | 160 | string internalIpStr = (string)responseData["sim_ip"]; |
161 | 161 | ||
162 | regionProfile = new RegionProfileData(); | 162 | regionProfile = new RegionProfileData(); |
163 | regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]); | 163 | regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]); |
164 | regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/"; | 164 | regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/"; |
165 | regionProfile.regionHandle = Utils.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize)); | 165 | regionProfile.regionHandle = Utils.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize)); |
166 | regionProfile.regionLocX = regX; | 166 | regionProfile.regionLocX = regX; |
167 | regionProfile.regionLocY = regY; | 167 | regionProfile.regionLocY = regY; |
168 | 168 | ||
169 | regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]); | 169 | regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]); |
170 | regionProfile.UUID = new UUID((string)responseData["region_UUID"]); | 170 | regionProfile.UUID = new UUID((string)responseData["region_UUID"]); |
171 | regionProfile.regionName = (string)responseData["region_name"]; | 171 | regionProfile.regionName = (string)responseData["region_name"]; |
172 | } | 172 | } |
173 | catch (WebException) | 173 | catch (WebException) |
174 | { | 174 | { |
175 | m_log.Error("[GRID]: " + | 175 | m_log.Error("[GRID]: " + |
176 | "Region lookup failed for: " + regionHandle.ToString() + | 176 | "Region lookup failed for: " + regionHandle.ToString() + |
177 | " - Is the GridServer down?"); | 177 | " - Is the GridServer down?"); |
178 | } | 178 | } |
179 | 179 | ||
180 | return regionProfile; | 180 | return regionProfile; |
181 | } | 181 | } |
182 | 182 | ||
183 | public XmlRpcResponse RegionStartup(XmlRpcRequest request) | 183 | public XmlRpcResponse RegionStartup(XmlRpcRequest request) |
184 | { | 184 | { |
185 | Hashtable requestData = (Hashtable)request.Params[0]; | 185 | Hashtable requestData = (Hashtable)request.Params[0]; |
186 | Hashtable result = new Hashtable(); | 186 | Hashtable result = new Hashtable(); |
187 | result["success"] = "FALSE"; | 187 | result["success"] = "FALSE"; |
188 | 188 | ||
189 | if (m_userServerModule.SendToUserServer(requestData, "region_startup")) | 189 | if (m_userServerModule.SendToUserServer(requestData, "region_startup")) |
190 | result["success"] = "TRUE"; | 190 | result["success"] = "TRUE"; |
191 | 191 | ||
192 | XmlRpcResponse response = new XmlRpcResponse(); | 192 | XmlRpcResponse response = new XmlRpcResponse(); |
193 | response.Value = result; | 193 | response.Value = result; |
194 | return response; | 194 | return response; |
195 | } | 195 | } |
196 | 196 | ||
197 | public XmlRpcResponse RegionShutdown(XmlRpcRequest request) | 197 | public XmlRpcResponse RegionShutdown(XmlRpcRequest request) |
198 | { | 198 | { |
199 | Hashtable requestData = (Hashtable)request.Params[0]; | 199 | Hashtable requestData = (Hashtable)request.Params[0]; |
200 | Hashtable result = new Hashtable(); | 200 | Hashtable result = new Hashtable(); |
201 | result["success"] = "FALSE"; | 201 | result["success"] = "FALSE"; |
202 | 202 | ||
203 | if (m_userServerModule.SendToUserServer(requestData, "region_shutdown")) | 203 | if (m_userServerModule.SendToUserServer(requestData, "region_shutdown")) |
204 | result["success"] = "TRUE"; | 204 | result["success"] = "TRUE"; |
205 | 205 | ||
206 | XmlRpcResponse response = new XmlRpcResponse(); | 206 | XmlRpcResponse response = new XmlRpcResponse(); |
207 | response.Value = result; | 207 | response.Value = result; |
208 | return response; | 208 | return response; |
209 | } | 209 | } |
210 | 210 | ||
211 | } | 211 | } |
212 | } | 212 | } |
diff --git a/OpenSim/Grid/MessagingServer/MessageUserServerModule.cs b/OpenSim/Grid/MessagingServer/MessageUserServerModule.cs index 904674f..c6bf9e7 100644 --- a/OpenSim/Grid/MessagingServer/MessageUserServerModule.cs +++ b/OpenSim/Grid/MessagingServer/MessageUserServerModule.cs | |||
@@ -1,185 +1,185 @@ | |||
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 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; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Net; | 31 | using System.Net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using System.Threading; | 33 | using System.Threading; |
34 | using System.Timers; | 34 | using System.Timers; |
35 | using log4net; | 35 | using log4net; |
36 | using Nwc.XmlRpc; | 36 | using Nwc.XmlRpc; |
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenSim.Data; | 38 | using OpenSim.Data; |
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using Timer = System.Timers.Timer; | 40 | using Timer = System.Timers.Timer; |
41 | 41 | ||
42 | namespace OpenSim.Grid.MessagingServer | 42 | namespace OpenSim.Grid.MessagingServer |
43 | { | 43 | { |
44 | public class MessageUserServerModule : IMessageUserServerService | 44 | public class MessageUserServerModule : IMessageUserServerService |
45 | { | 45 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | private MessageServerConfig m_cfg; | 48 | private MessageServerConfig m_cfg; |
49 | 49 | ||
50 | private IUGAIMCore m_messageCore; | 50 | private IUGAIMCore m_messageCore; |
51 | 51 | ||
52 | private Timer reconnectTimer = new Timer(300000); // 5 mins | 52 | private Timer reconnectTimer = new Timer(300000); // 5 mins |
53 | 53 | ||
54 | public MessageUserServerModule(MessageServerConfig config, IUGAIMCore messageCore) | 54 | public MessageUserServerModule(MessageServerConfig config, IUGAIMCore messageCore) |
55 | { | 55 | { |
56 | m_cfg = config; | 56 | m_cfg = config; |
57 | m_messageCore = messageCore; | 57 | m_messageCore = messageCore; |
58 | 58 | ||
59 | reconnectTimer.Elapsed += registerWithUserServer; | 59 | reconnectTimer.Elapsed += registerWithUserServer; |
60 | reconnectTimer.Start(); | 60 | reconnectTimer.Start(); |
61 | } | 61 | } |
62 | 62 | ||
63 | public void Initialise() | 63 | public void Initialise() |
64 | { | 64 | { |
65 | m_messageCore.RegisterInterface<IMessageUserServerService>(this); | 65 | m_messageCore.RegisterInterface<IMessageUserServerService>(this); |
66 | } | 66 | } |
67 | 67 | ||
68 | public void PostInitialise() | 68 | public void PostInitialise() |
69 | { | 69 | { |
70 | 70 | ||
71 | } | 71 | } |
72 | 72 | ||
73 | public void RegisterHandlers() | 73 | public void RegisterHandlers() |
74 | { | 74 | { |
75 | //have these in separate method as some servers restart the http server and reregister all the handlers. | 75 | //have these in separate method as some servers restart the http server and reregister all the handlers. |
76 | 76 | ||
77 | } | 77 | } |
78 | 78 | ||
79 | public void registerWithUserServer(object sender, ElapsedEventArgs e) | 79 | public void registerWithUserServer(object sender, ElapsedEventArgs e) |
80 | { | 80 | { |
81 | registerWithUserServer(); | 81 | registerWithUserServer(); |
82 | } | 82 | } |
83 | 83 | ||
84 | public bool registerWithUserServer() | 84 | public bool registerWithUserServer() |
85 | { | 85 | { |
86 | Hashtable UserParams = new Hashtable(); | 86 | Hashtable UserParams = new Hashtable(); |
87 | // Login / Authentication | 87 | // Login / Authentication |
88 | 88 | ||
89 | if (m_cfg.HttpSSL) | 89 | if (m_cfg.HttpSSL) |
90 | { | 90 | { |
91 | UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; | 91 | UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; |
92 | } | 92 | } |
93 | else | 93 | else |
94 | { | 94 | { |
95 | UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; | 95 | UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; |
96 | } | 96 | } |
97 | 97 | ||
98 | UserParams["recvkey"] = m_cfg.UserRecvKey; | 98 | UserParams["recvkey"] = m_cfg.UserRecvKey; |
99 | UserParams["sendkey"] = m_cfg.UserRecvKey; | 99 | UserParams["sendkey"] = m_cfg.UserRecvKey; |
100 | 100 | ||
101 | // Package into an XMLRPC Request | 101 | // Package into an XMLRPC Request |
102 | ArrayList SendParams = new ArrayList(); | 102 | ArrayList SendParams = new ArrayList(); |
103 | SendParams.Add(UserParams); | 103 | SendParams.Add(UserParams); |
104 | 104 | ||
105 | bool success = true; | 105 | bool success = true; |
106 | string[] servers = m_cfg.UserServerURL.Split(' '); | 106 | string[] servers = m_cfg.UserServerURL.Split(' '); |
107 | 107 | ||
108 | foreach (string srv in servers) | 108 | foreach (string srv in servers) |
109 | { | 109 | { |
110 | // Send Request | 110 | // Send Request |
111 | try | 111 | try |
112 | { | 112 | { |
113 | XmlRpcRequest UserReq = new XmlRpcRequest("register_messageserver", SendParams); | 113 | XmlRpcRequest UserReq = new XmlRpcRequest("register_messageserver", SendParams); |
114 | XmlRpcResponse UserResp = UserReq.Send(srv, 16000); | 114 | XmlRpcResponse UserResp = UserReq.Send(srv, 16000); |
115 | 115 | ||
116 | // Process Response | 116 | // Process Response |
117 | Hashtable GridRespData = (Hashtable)UserResp.Value; | 117 | Hashtable GridRespData = (Hashtable)UserResp.Value; |
118 | // if we got a response, we were successful | 118 | // if we got a response, we were successful |
119 | if (!GridRespData.ContainsKey("responsestring")) | 119 | if (!GridRespData.ContainsKey("responsestring")) |
120 | success = false; | 120 | success = false; |
121 | else | 121 | else |
122 | m_log.InfoFormat("[SERVER] Registered with {0}", srv); | 122 | m_log.InfoFormat("[SERVER] Registered with {0}", srv); |
123 | } | 123 | } |
124 | catch | 124 | catch |
125 | { | 125 | { |
126 | m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv); | 126 | m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv); |
127 | success = false; | 127 | success = false; |
128 | } | 128 | } |
129 | } | 129 | } |
130 | return success; | 130 | return success; |
131 | } | 131 | } |
132 | 132 | ||
133 | public bool deregisterWithUserServer() | 133 | public bool deregisterWithUserServer() |
134 | { | 134 | { |
135 | Hashtable request = new Hashtable(); | 135 | Hashtable request = new Hashtable(); |
136 | 136 | ||
137 | return SendToUserServer(request, "deregister_messageserver"); | 137 | return SendToUserServer(request, "deregister_messageserver"); |
138 | } | 138 | } |
139 | 139 | ||
140 | public bool SendToUserServer(Hashtable request, string method) | 140 | public bool SendToUserServer(Hashtable request, string method) |
141 | { | 141 | { |
142 | // Login / Authentication | 142 | // Login / Authentication |
143 | 143 | ||
144 | if (m_cfg.HttpSSL) | 144 | if (m_cfg.HttpSSL) |
145 | { | 145 | { |
146 | request["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; | 146 | request["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; |
147 | } | 147 | } |
148 | else | 148 | else |
149 | { | 149 | { |
150 | request["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; | 150 | request["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; |
151 | } | 151 | } |
152 | 152 | ||
153 | request["recvkey"] = m_cfg.UserRecvKey; | 153 | request["recvkey"] = m_cfg.UserRecvKey; |
154 | request["sendkey"] = m_cfg.UserRecvKey; | 154 | request["sendkey"] = m_cfg.UserRecvKey; |
155 | 155 | ||
156 | // Package into an XMLRPC Request | 156 | // Package into an XMLRPC Request |
157 | ArrayList SendParams = new ArrayList(); | 157 | ArrayList SendParams = new ArrayList(); |
158 | SendParams.Add(request); | 158 | SendParams.Add(request); |
159 | 159 | ||
160 | bool success = true; | 160 | bool success = true; |
161 | string[] servers = m_cfg.UserServerURL.Split(' '); | 161 | string[] servers = m_cfg.UserServerURL.Split(' '); |
162 | 162 | ||
163 | // Send Request | 163 | // Send Request |
164 | foreach (string srv in servers) | 164 | foreach (string srv in servers) |
165 | { | 165 | { |
166 | try | 166 | try |
167 | { | 167 | { |
168 | XmlRpcRequest UserReq = new XmlRpcRequest(method, SendParams); | 168 | XmlRpcRequest UserReq = new XmlRpcRequest(method, SendParams); |
169 | XmlRpcResponse UserResp = UserReq.Send(m_cfg.UserServerURL, 16000); | 169 | XmlRpcResponse UserResp = UserReq.Send(m_cfg.UserServerURL, 16000); |
170 | // Process Response | 170 | // Process Response |
171 | Hashtable UserRespData = (Hashtable)UserResp.Value; | 171 | Hashtable UserRespData = (Hashtable)UserResp.Value; |
172 | // if we got a response, we were successful | 172 | // if we got a response, we were successful |
173 | if (!UserRespData.ContainsKey("responsestring")) | 173 | if (!UserRespData.ContainsKey("responsestring")) |
174 | success = false; | 174 | success = false; |
175 | } | 175 | } |
176 | catch | 176 | catch |
177 | { | 177 | { |
178 | m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv); | 178 | m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv); |
179 | success = false; | 179 | success = false; |
180 | } | 180 | } |
181 | } | 181 | } |
182 | return success; | 182 | return success; |
183 | } | 183 | } |
184 | } | 184 | } |
185 | } | 185 | } |
diff --git a/OpenSim/Grid/MessagingServer/UserDataBaseService.cs b/OpenSim/Grid/MessagingServer/UserDataBaseService.cs index f554cc2..32d5e61 100644 --- a/OpenSim/Grid/MessagingServer/UserDataBaseService.cs +++ b/OpenSim/Grid/MessagingServer/UserDataBaseService.cs | |||
@@ -1,75 +1,75 @@ | |||
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 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 OpenMetaverse; | 28 | using OpenMetaverse; |
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenSim.Framework.Communications; | 30 | using OpenSim.Framework.Communications; |
31 | 31 | ||
32 | namespace OpenSim.Grid.MessagingServer | 32 | namespace OpenSim.Grid.MessagingServer |
33 | { | 33 | { |
34 | public class UserDataBaseService : UserManagerBase | 34 | public class UserDataBaseService : UserManagerBase |
35 | { | 35 | { |
36 | /// <summary> | 36 | /// <summary> |
37 | /// Constructor. | 37 | /// Constructor. |
38 | /// </summary> | 38 | /// </summary> |
39 | /// Passing null to parent because we never use any function that requires an interservice inventory call. | 39 | /// Passing null to parent because we never use any function that requires an interservice inventory call. |
40 | public UserDataBaseService() | 40 | public UserDataBaseService() |
41 | : base(null) | 41 | : base(null) |
42 | { | 42 | { |
43 | } | 43 | } |
44 | 44 | ||
45 | public UserAgentData GetUserAgentData(UUID AgentID) | 45 | public UserAgentData GetUserAgentData(UUID AgentID) |
46 | { | 46 | { |
47 | UserProfileData userProfile = GetUserProfile(AgentID); | 47 | UserProfileData userProfile = GetUserProfile(AgentID); |
48 | 48 | ||
49 | if (userProfile != null) | 49 | if (userProfile != null) |
50 | { | 50 | { |
51 | return userProfile.CurrentAgent; | 51 | return userProfile.CurrentAgent; |
52 | } | 52 | } |
53 | 53 | ||
54 | return null; | 54 | return null; |
55 | } | 55 | } |
56 | 56 | ||
57 | public override UserProfileData SetupMasterUser(string firstName, string lastName) | 57 | public override UserProfileData SetupMasterUser(string firstName, string lastName) |
58 | { | 58 | { |
59 | //throw new Exception("The method or operation is not implemented."); | 59 | //throw new Exception("The method or operation is not implemented."); |
60 | return null; | 60 | return null; |
61 | } | 61 | } |
62 | 62 | ||
63 | public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) | 63 | public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) |
64 | { | 64 | { |
65 | //throw new Exception("The method or operation is not implemented."); | 65 | //throw new Exception("The method or operation is not implemented."); |
66 | return null; | 66 | return null; |
67 | } | 67 | } |
68 | 68 | ||
69 | public override UserProfileData SetupMasterUser(UUID uuid) | 69 | public override UserProfileData SetupMasterUser(UUID uuid) |
70 | { | 70 | { |
71 | //throw new Exception("The method or operation is not implemented."); | 71 | //throw new Exception("The method or operation is not implemented."); |
72 | return null; | 72 | return null; |
73 | } | 73 | } |
74 | } | 74 | } |
75 | } | 75 | } |
diff --git a/OpenSim/Grid/UserServer/UserDataBaseService.cs b/OpenSim/Grid/UserServer/UserDataBaseService.cs index 6c144d9..85c98a6 100644 --- a/OpenSim/Grid/UserServer/UserDataBaseService.cs +++ b/OpenSim/Grid/UserServer/UserDataBaseService.cs | |||
@@ -1,68 +1,68 @@ | |||
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 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; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using log4net; | 32 | using log4net; |
33 | using Nwc.XmlRpc; | 33 | using Nwc.XmlRpc; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications; | 36 | using OpenSim.Framework.Communications; |
37 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
38 | 38 | ||
39 | namespace OpenSim.Grid.UserServer | 39 | namespace OpenSim.Grid.UserServer |
40 | { | 40 | { |
41 | public class UserDataBaseService : UserManagerBase | 41 | public class UserDataBaseService : UserManagerBase |
42 | { | 42 | { |
43 | public UserDataBaseService() | 43 | public UserDataBaseService() |
44 | : base(null) | 44 | : base(null) |
45 | { | 45 | { |
46 | } | 46 | } |
47 | 47 | ||
48 | public UserDataBaseService(IInterServiceInventoryServices interServiceInventoryService) | 48 | public UserDataBaseService(IInterServiceInventoryServices interServiceInventoryService) |
49 | : base(interServiceInventoryService) | 49 | : base(interServiceInventoryService) |
50 | { | 50 | { |
51 | } | 51 | } |
52 | 52 | ||
53 | public override UserProfileData SetupMasterUser(string firstName, string lastName) | 53 | public override UserProfileData SetupMasterUser(string firstName, string lastName) |
54 | { | 54 | { |
55 | throw new Exception("The method or operation is not implemented."); | 55 | throw new Exception("The method or operation is not implemented."); |
56 | } | 56 | } |
57 | 57 | ||
58 | public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) | 58 | public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) |
59 | { | 59 | { |
60 | throw new Exception("The method or operation is not implemented."); | 60 | throw new Exception("The method or operation is not implemented."); |
61 | } | 61 | } |
62 | 62 | ||
63 | public override UserProfileData SetupMasterUser(UUID uuid) | 63 | public override UserProfileData SetupMasterUser(UUID uuid) |
64 | { | 64 | { |
65 | throw new Exception("The method or operation is not implemented."); | 65 | throw new Exception("The method or operation is not implemented."); |
66 | } | 66 | } |
67 | } | 67 | } |
68 | } | 68 | } |