diff options
Diffstat (limited to 'OpenSim/Services/Interfaces/IGridService.cs')
-rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 245 |
1 files changed, 236 insertions, 9 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 83ab9c1..ce432ab 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -25,8 +25,11 @@ | |||
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 OpenSim.Framework; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Net; | ||
31 | using System.Net.Sockets; | ||
32 | using OpenSim.Framework; | ||
30 | using OpenMetaverse; | 33 | using OpenMetaverse; |
31 | 34 | ||
32 | namespace OpenSim.Services.Interfaces | 35 | namespace OpenSim.Services.Interfaces |
@@ -39,7 +42,7 @@ namespace OpenSim.Services.Interfaces | |||
39 | /// <param name="regionInfos"> </param> | 42 | /// <param name="regionInfos"> </param> |
40 | /// <returns></returns> | 43 | /// <returns></returns> |
41 | /// <exception cref="System.Exception">Thrown if region registration failed</exception> | 44 | /// <exception cref="System.Exception">Thrown if region registration failed</exception> |
42 | bool RegisterRegion(UUID scopeID, SimpleRegionInfo regionInfos); | 45 | bool RegisterRegion(UUID scopeID, GridRegion regionInfos); |
43 | 46 | ||
44 | /// <summary> | 47 | /// <summary> |
45 | /// Deregister a region with the grid service. | 48 | /// Deregister a region with the grid service. |
@@ -55,9 +58,9 @@ namespace OpenSim.Services.Interfaces | |||
55 | /// <param name="x"></param> | 58 | /// <param name="x"></param> |
56 | /// <param name="y"></param> | 59 | /// <param name="y"></param> |
57 | /// <returns></returns> | 60 | /// <returns></returns> |
58 | List<SimpleRegionInfo> GetNeighbours(UUID scopeID, int x, int y); | 61 | List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID); |
59 | 62 | ||
60 | SimpleRegionInfo GetRegionByUUID(UUID scopeID, UUID regionID); | 63 | GridRegion GetRegionByUUID(UUID scopeID, UUID regionID); |
61 | 64 | ||
62 | /// <summary> | 65 | /// <summary> |
63 | /// Get the region at the given position (in meters) | 66 | /// Get the region at the given position (in meters) |
@@ -66,9 +69,9 @@ namespace OpenSim.Services.Interfaces | |||
66 | /// <param name="x"></param> | 69 | /// <param name="x"></param> |
67 | /// <param name="y"></param> | 70 | /// <param name="y"></param> |
68 | /// <returns></returns> | 71 | /// <returns></returns> |
69 | SimpleRegionInfo GetRegionByPosition(UUID scopeID, int x, int y); | 72 | GridRegion GetRegionByPosition(UUID scopeID, int x, int y); |
70 | 73 | ||
71 | SimpleRegionInfo GetRegionByName(UUID scopeID, string regionName); | 74 | GridRegion GetRegionByName(UUID scopeID, string regionName); |
72 | 75 | ||
73 | /// <summary> | 76 | /// <summary> |
74 | /// Get information about regions starting with the provided name. | 77 | /// Get information about regions starting with the provided name. |
@@ -83,9 +86,233 @@ namespace OpenSim.Services.Interfaces | |||
83 | /// A list of <see cref="RegionInfo"/>s of regions with matching name. If the | 86 | /// A list of <see cref="RegionInfo"/>s of regions with matching name. If the |
84 | /// grid-server couldn't be contacted or returned an error, return null. | 87 | /// grid-server couldn't be contacted or returned an error, return null. |
85 | /// </returns> | 88 | /// </returns> |
86 | List<SimpleRegionInfo> GetRegionsByName(UUID scopeID, string name, int maxNumber); | 89 | List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber); |
87 | 90 | ||
88 | List<SimpleRegionInfo> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax); | 91 | List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax); |
89 | 92 | ||
90 | } | 93 | } |
94 | |||
95 | public class GridRegion | ||
96 | { | ||
97 | |||
98 | /// <summary> | ||
99 | /// The port by which http communication occurs with the region | ||
100 | /// </summary> | ||
101 | public uint HttpPort | ||
102 | { | ||
103 | get { return m_httpPort; } | ||
104 | set { m_httpPort = value; } | ||
105 | } | ||
106 | protected uint m_httpPort; | ||
107 | |||
108 | /// <summary> | ||
109 | /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) | ||
110 | /// </summary> | ||
111 | public string ServerURI | ||
112 | { | ||
113 | get { return m_serverURI; } | ||
114 | set { m_serverURI = value; } | ||
115 | } | ||
116 | protected string m_serverURI; | ||
117 | |||
118 | public string RegionName | ||
119 | { | ||
120 | get { return m_regionName; } | ||
121 | set { m_regionName = value; } | ||
122 | } | ||
123 | protected string m_regionName = String.Empty; | ||
124 | |||
125 | protected bool Allow_Alternate_Ports; | ||
126 | public bool m_allow_alternate_ports; | ||
127 | |||
128 | protected string m_externalHostName; | ||
129 | |||
130 | protected IPEndPoint m_internalEndPoint; | ||
131 | |||
132 | public int RegionLocX | ||
133 | { | ||
134 | get { return m_regionLocX; } | ||
135 | set { m_regionLocX = value; } | ||
136 | } | ||
137 | protected int m_regionLocX; | ||
138 | |||
139 | public int RegionLocY | ||
140 | { | ||
141 | get { return m_regionLocY; } | ||
142 | set { m_regionLocY = value; } | ||
143 | } | ||
144 | protected int m_regionLocY; | ||
145 | |||
146 | public UUID RegionID = UUID.Zero; | ||
147 | public UUID ScopeID = UUID.Zero; | ||
148 | |||
149 | public GridRegion() | ||
150 | { | ||
151 | } | ||
152 | |||
153 | public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri) | ||
154 | { | ||
155 | m_regionLocX = regionLocX; | ||
156 | m_regionLocY = regionLocY; | ||
157 | |||
158 | m_internalEndPoint = internalEndPoint; | ||
159 | m_externalHostName = externalUri; | ||
160 | } | ||
161 | |||
162 | public GridRegion(int regionLocX, int regionLocY, string externalUri, uint port) | ||
163 | { | ||
164 | m_regionLocX = regionLocX; | ||
165 | m_regionLocY = regionLocY; | ||
166 | |||
167 | m_externalHostName = externalUri; | ||
168 | |||
169 | m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)port); | ||
170 | } | ||
171 | |||
172 | public GridRegion(uint xcell, uint ycell) | ||
173 | { | ||
174 | m_regionLocX = (int)(xcell * Constants.RegionSize); | ||
175 | m_regionLocY = (int)(ycell * Constants.RegionSize); | ||
176 | } | ||
177 | |||
178 | public GridRegion(RegionInfo ConvertFrom) | ||
179 | { | ||
180 | m_regionName = ConvertFrom.RegionName; | ||
181 | m_regionLocX = (int)(ConvertFrom.RegionLocX * Constants.RegionSize); | ||
182 | m_regionLocY = (int)(ConvertFrom.RegionLocY * Constants.RegionSize); | ||
183 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | ||
184 | m_externalHostName = ConvertFrom.ExternalHostName; | ||
185 | m_httpPort = ConvertFrom.HttpPort; | ||
186 | m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; | ||
187 | RegionID = UUID.Zero; | ||
188 | ServerURI = ConvertFrom.ServerURI; | ||
189 | } | ||
190 | |||
191 | |||
192 | /// <value> | ||
193 | /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw. | ||
194 | /// | ||
195 | /// XXX Isn't this really doing too much to be a simple getter, rather than an explict method? | ||
196 | /// </value> | ||
197 | public IPEndPoint ExternalEndPoint | ||
198 | { | ||
199 | get | ||
200 | { | ||
201 | // Old one defaults to IPv6 | ||
202 | //return new IPEndPoint(Dns.GetHostAddresses(m_externalHostName)[0], m_internalEndPoint.Port); | ||
203 | |||
204 | IPAddress ia = null; | ||
205 | // If it is already an IP, don't resolve it - just return directly | ||
206 | if (IPAddress.TryParse(m_externalHostName, out ia)) | ||
207 | return new IPEndPoint(ia, m_internalEndPoint.Port); | ||
208 | |||
209 | // Reset for next check | ||
210 | ia = null; | ||
211 | try | ||
212 | { | ||
213 | foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName)) | ||
214 | { | ||
215 | if (ia == null) | ||
216 | ia = Adr; | ||
217 | |||
218 | if (Adr.AddressFamily == AddressFamily.InterNetwork) | ||
219 | { | ||
220 | ia = Adr; | ||
221 | break; | ||
222 | } | ||
223 | } | ||
224 | } | ||
225 | catch (SocketException e) | ||
226 | { | ||
227 | throw new Exception( | ||
228 | "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" + | ||
229 | e + "' attached to this exception", e); | ||
230 | } | ||
231 | |||
232 | return new IPEndPoint(ia, m_internalEndPoint.Port); | ||
233 | } | ||
234 | |||
235 | set { m_externalHostName = value.ToString(); } | ||
236 | } | ||
237 | |||
238 | public string ExternalHostName | ||
239 | { | ||
240 | get { return m_externalHostName; } | ||
241 | set { m_externalHostName = value; } | ||
242 | } | ||
243 | |||
244 | public IPEndPoint InternalEndPoint | ||
245 | { | ||
246 | get { return m_internalEndPoint; } | ||
247 | set { m_internalEndPoint = value; } | ||
248 | } | ||
249 | |||
250 | public ulong RegionHandle | ||
251 | { | ||
252 | get { return Util.UIntsToLong((uint)RegionLocX, (uint)RegionLocY); } | ||
253 | } | ||
254 | |||
255 | public int getInternalEndPointPort() | ||
256 | { | ||
257 | return m_internalEndPoint.Port; | ||
258 | } | ||
259 | |||
260 | public Dictionary<string, object> ToKeyValuePairs() | ||
261 | { | ||
262 | Dictionary<string, object> kvp = new Dictionary<string, object>(); | ||
263 | kvp["uuid"] = RegionID.ToString(); | ||
264 | kvp["locX"] = RegionLocX.ToString(); | ||
265 | kvp["locY"] = RegionLocY.ToString(); | ||
266 | kvp["regionName"] = RegionName; | ||
267 | kvp["serverIP"] = ExternalHostName; //ExternalEndPoint.Address.ToString(); | ||
268 | kvp["serverHttpPort"] = HttpPort.ToString(); | ||
269 | kvp["serverURI"] = ServerURI; | ||
270 | kvp["serverPort"] = InternalEndPoint.Port.ToString(); | ||
271 | |||
272 | return kvp; | ||
273 | } | ||
274 | |||
275 | public GridRegion(Dictionary<string, object> kvp) | ||
276 | { | ||
277 | if (kvp.ContainsKey("uuid")) | ||
278 | RegionID = new UUID((string)kvp["uuid"]); | ||
279 | |||
280 | if (kvp.ContainsKey("locX")) | ||
281 | RegionLocX = Convert.ToInt32((string)kvp["locX"]); | ||
282 | |||
283 | if (kvp.ContainsKey("locY")) | ||
284 | RegionLocY = Convert.ToInt32((string)kvp["locY"]); | ||
285 | |||
286 | if (kvp.ContainsKey("regionName")) | ||
287 | RegionName = (string)kvp["regionName"]; | ||
288 | |||
289 | if (kvp.ContainsKey("serverIP")) | ||
290 | { | ||
291 | //int port = 0; | ||
292 | //Int32.TryParse((string)kvp["serverPort"], out port); | ||
293 | //IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["serverIP"]), port); | ||
294 | ExternalHostName = (string)kvp["serverIP"]; | ||
295 | } | ||
296 | else | ||
297 | ExternalHostName = "127.0.0.1"; | ||
298 | |||
299 | if (kvp.ContainsKey("serverPort")) | ||
300 | { | ||
301 | Int32 port = 0; | ||
302 | Int32.TryParse((string)kvp["serverPort"], out port); | ||
303 | InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port); | ||
304 | } | ||
305 | |||
306 | if (kvp.ContainsKey("serverHttpPort")) | ||
307 | { | ||
308 | UInt32 port = 0; | ||
309 | UInt32.TryParse((string)kvp["serverHttpPort"], out port); | ||
310 | HttpPort = port; | ||
311 | } | ||
312 | |||
313 | if (kvp.ContainsKey("serverURI")) | ||
314 | ServerURI = (string)kvp["serverURI"]; | ||
315 | } | ||
316 | } | ||
317 | |||
91 | } | 318 | } |