From d5fbb2610d15bdcd7170063c207f6780d7f5e2cd Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Fri, 17 Apr 2009 11:12:06 +0000 Subject: Adds a new REST service /admin/regioninfo/ --- will return a comprehensive list of all regions in one go (in contrast to the /admin/regions/ REST call). Example: % curl http://127.0.0.1:9000/admin/regioninfo/ --- .../Rest/Regions/GETRegionInfoHandler.cs | 143 +++++++++++++++++++++ .../Rest/Regions/RestRegionPlugin.cs | 1 + 2 files changed, 144 insertions(+) create mode 100644 OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs (limited to 'OpenSim') diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs new file mode 100644 index 0000000..bd0089c --- /dev/null +++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs @@ -0,0 +1,143 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * 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 + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using System.IO; +using System.Xml.Serialization; +using OpenMetaverse; +using OpenSim.Framework.Servers; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; + +namespace OpenSim.ApplicationPlugins.Rest.Regions +{ + public partial class RestRegionPlugin : RestPlugin + { + #region GET methods + public string GetRegionInfoHandler(string request, string path, string param, + OSHttpRequest httpRequest, OSHttpResponse httpResponse) + { + // foreach (string h in httpRequest.Headers.AllKeys) + // foreach (string v in httpRequest.Headers.GetValues(h)) + // m_log.DebugFormat("{0} IsGod: {1} -> {2}", MsgID, h, v); + + MsgID = RequestID; + m_log.DebugFormat("{0} GET path {1} param {2}", MsgID, path, param); + + try + { + // param empty: regions list + // if (String.IsNullOrEmpty(param)) + return GetRegionInfoHandlerRegions(httpResponse); + + // // param not empty: specific region + // return GetRegionInfoHandlerRegion(httpResponse, param); + } + catch (Exception e) + { + return Failure(httpResponse, OSHttpStatusCode.ServerErrorInternalError, "GET", e); + } + } + + public string GetRegionInfoHandlerRegions(OSHttpResponse httpResponse) + { + // regions info + XmlWriter.WriteStartElement(String.Empty, "regions", String.Empty); + { + // regions info: number of regions + XmlWriter.WriteStartAttribute(String.Empty, "number", String.Empty); + XmlWriter.WriteValue(App.SceneManager.Scenes.Count); + XmlWriter.WriteEndAttribute(); + + // regions info: max number of regions + XmlWriter.WriteStartAttribute(String.Empty, "max", String.Empty); + if (App.ConfigSource.Source.Configs["RemoteAdmin"] != null) + { + XmlWriter.WriteValue(App.ConfigSource.Source.Configs["RemoteAdmin"].GetInt("region_limit", -1)); + } + else + { + XmlWriter.WriteValue(-1); + } + XmlWriter.WriteEndAttribute(); + + // regions info: region + foreach (Scene s in App.SceneManager.Scenes) + { + XmlWriter.WriteStartElement(String.Empty, "region", String.Empty); + + XmlWriter.WriteStartAttribute(String.Empty, "uuid", String.Empty); + XmlWriter.WriteString(s.RegionInfo.RegionID.ToString()); + XmlWriter.WriteEndAttribute(); + + XmlWriter.WriteStartAttribute(String.Empty, "name", String.Empty); + XmlWriter.WriteString(s.RegionInfo.RegionName); + XmlWriter.WriteEndAttribute(); + + XmlWriter.WriteStartAttribute(String.Empty, "x", String.Empty); + XmlWriter.WriteValue(s.RegionInfo.RegionLocX); + XmlWriter.WriteEndAttribute(); + + XmlWriter.WriteStartAttribute(String.Empty, "y", String.Empty); + XmlWriter.WriteValue(s.RegionInfo.RegionLocY); + XmlWriter.WriteEndAttribute(); + + XmlWriter.WriteStartAttribute(String.Empty, "external_hostname", String.Empty); + XmlWriter.WriteString(s.RegionInfo.ExternalHostName); + XmlWriter.WriteEndAttribute(); + + XmlWriter.WriteStartAttribute(String.Empty, "master_name", String.Empty); + XmlWriter.WriteString(String.Format("{0} {1}", s.RegionInfo.MasterAvatarFirstName, s.RegionInfo.MasterAvatarLastName)); + XmlWriter.WriteEndAttribute(); + + XmlWriter.WriteStartAttribute(String.Empty, "master_uuid", String.Empty); + XmlWriter.WriteString(s.RegionInfo.MasterAvatarAssignedUUID.ToString()); + XmlWriter.WriteEndAttribute(); + + XmlWriter.WriteStartAttribute(String.Empty, "ip", String.Empty); + XmlWriter.WriteString(s.RegionInfo.InternalEndPoint.ToString()); + XmlWriter.WriteEndAttribute(); + + int users = s.GetAvatars().Count; + XmlWriter.WriteStartAttribute(String.Empty, "avatars", String.Empty); + XmlWriter.WriteValue(users); + XmlWriter.WriteEndAttribute(); + + XmlWriter.WriteStartAttribute(String.Empty, "objects", String.Empty); + XmlWriter.WriteValue(s.Entities.Count - users); + XmlWriter.WriteEndAttribute(); + + XmlWriter.WriteEndElement(); + } + } + XmlWriter.WriteEndElement(); + + return XmlWriterResult; + } + #endregion GET methods + } +} diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs index fdfeb7d..ef72f71 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs @@ -76,6 +76,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions // add REST method handlers AddRestStreamHandler("GET", "/regions/", GetHandler); AddRestStreamHandler("POST", "/regions/", PostHandler); + AddRestStreamHandler("GET", "/regioninfo/", GetRegionInfoHandler); } catch (Exception e) { -- cgit v1.1