ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

add GetLocalRegionByName to GridServicesConnector plus cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2024-09-21 00:41:25 +01:00
parent fcddf631ce
commit 3823940205
5 changed files with 498 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Server/Base/ServerUtils.cs
View File

@@ -543,19 +543,21 @@ namespace OpenSim.Server.Base
public static Dictionary<string, object> ParseXmlResponse(string data)
{
try
if(!string.IsNullOrEmpty(data))
{
using XmlReader xr = XmlReader.Create(new StringReader(data),
ParseXmlStringResponseXmlReaderSettings, ParseXmlResponseXmlParserContext);
if (!xr.ReadToFollowing("ServerResponse"))
return new Dictionary<string, object>();
return ScanXmlResponse(xr);
try
{
using XmlReader xr = XmlReader.Create(new StringReader(data),
ParseXmlStringResponseXmlReaderSettings, ParseXmlResponseXmlParserContext);
if (xr.ReadToFollowing("ServerResponse"))
return ScanXmlResponse(xr);
}
catch (Exception e)
{
m_log.Debug($"[serverUtils.ParseXmlResponse]: failed error: {e.Message}\n --string:\n{data}\n");
}
}
catch (Exception e)
{
m_log.DebugFormat("[serverUtils.ParseXmlResponse]: failed error: {0}\n --string:\n{1}\n", e.Message, data);
}
return new Dictionary<string, object>();
return [];
}
private static readonly XmlReaderSettings ParseXmlStreamResponseXmlReaderSettings = new()

42
OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
View File

@@ -102,6 +102,9 @@ namespace OpenSim.Server.Handlers.Grid
case "get_region_by_name":
return GetRegionByName(request);
case "get_localregion_by_name":
return GetLocalRegionByName(request);
case "get_regions_by_name":
return GetRegionsByName(request);
@@ -327,21 +330,40 @@ namespace OpenSim.Server.Handlers.Grid
byte[] GetRegionByName(Dictionary<string, object> request)
{
UUID scopeID = UUID.Zero;
if (request.ContainsKey("SCOPEID"))
UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
else
m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get region by name");
if (!request.TryGetValue("SCOPEID", out object scpo) || scpo is not string scps || !UUID.TryParse(scps, out scopeID))
m_log.WarnFormat("[GRID HANDLER]: no or invalid scopeID in request to get region by name");
string regionName = string.Empty;
if (request.ContainsKey("NAME"))
regionName = request["NAME"].ToString();
GridRegion rinfo = null;
if (request.TryGetValue("NAME", out object nameo) && nameo is string regionName)
rinfo = m_GridService.GetRegionByName(scopeID, regionName);
else
m_log.WarnFormat("[GRID HANDLER]: no name in request to get region by name");
GridRegion rinfo = m_GridService.GetRegionByName(scopeID, regionName);
//m_log.DebugFormat("[GRID HANDLER]: neighbours for region {0}: {1}", regionID, rinfos.Count);
Dictionary<string, object> result = [];
if (rinfo == null)
result["result"] = "null";
else
result["result"] = rinfo.ToKeyValuePairs();
Dictionary<string, object> result = new Dictionary<string, object>();
string xmlString = ServerUtils.BuildXmlResponse(result);
//m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
return Util.UTF8NoBomEncoding.GetBytes(xmlString);
}
byte[] GetLocalRegionByName(Dictionary<string, object> request)
{
UUID scopeID = UUID.Zero;
if (!request.TryGetValue("SCOPEID", out object scpo) || scpo is not string scps || !UUID.TryParse(scps, out scopeID))
m_log.WarnFormat("[GRID HANDLER]: no or invalid scopeID in request to get region by name");
GridRegion rinfo = null;
if (request.TryGetValue("NAME", out object nameo) && nameo is string regionName)
rinfo = m_GridService.GetLocalRegionByName(scopeID, regionName);
else
m_log.WarnFormat("[GRID HANDLER]: no name in request to get region by name");
Dictionary<string, object> result = [];
if (rinfo == null)
result["result"] = "null";
else