From 9cef5f92a1c3edf2ef475706931f1536f2c8524f Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 27 Dec 2009 03:31:53 +0000 Subject: Change the signature of the forms requester data in preparation to getting to where lists can be sent as requests --- OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenSim/Services/Connectors/Grid') diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs index 02f2b79..99aa3fb 100644 --- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs @@ -89,7 +89,7 @@ namespace OpenSim.Services.Connectors public virtual bool RegisterRegion(UUID scopeID, GridRegion regionInfo) { Dictionary rinfo = regionInfo.ToKeyValuePairs(); - Dictionary sendData = new Dictionary(); + Dictionary sendData = new Dictionary(); foreach (KeyValuePair kvp in rinfo) sendData[kvp.Key] = (string)kvp.Value; @@ -130,7 +130,7 @@ namespace OpenSim.Services.Connectors public virtual bool DeregisterRegion(UUID regionID) { - Dictionary sendData = new Dictionary(); + Dictionary sendData = new Dictionary(); sendData["REGIONID"] = regionID.ToString(); @@ -162,7 +162,7 @@ namespace OpenSim.Services.Connectors public virtual List GetNeighbours(UUID scopeID, UUID regionID) { - Dictionary sendData = new Dictionary(); + Dictionary sendData = new Dictionary(); sendData["SCOPEID"] = scopeID.ToString(); sendData["REGIONID"] = regionID.ToString(); @@ -212,7 +212,7 @@ namespace OpenSim.Services.Connectors public virtual GridRegion GetRegionByUUID(UUID scopeID, UUID regionID) { - Dictionary sendData = new Dictionary(); + Dictionary sendData = new Dictionary(); sendData["SCOPEID"] = scopeID.ToString(); sendData["REGIONID"] = regionID.ToString(); @@ -258,7 +258,7 @@ namespace OpenSim.Services.Connectors public virtual GridRegion GetRegionByPosition(UUID scopeID, int x, int y) { - Dictionary sendData = new Dictionary(); + Dictionary sendData = new Dictionary(); sendData["SCOPEID"] = scopeID.ToString(); sendData["X"] = x.ToString(); @@ -303,7 +303,7 @@ namespace OpenSim.Services.Connectors public virtual GridRegion GetRegionByName(UUID scopeID, string regionName) { - Dictionary sendData = new Dictionary(); + Dictionary sendData = new Dictionary(); sendData["SCOPEID"] = scopeID.ToString(); sendData["NAME"] = regionName; @@ -344,7 +344,7 @@ namespace OpenSim.Services.Connectors public virtual List GetRegionsByName(UUID scopeID, string name, int maxNumber) { - Dictionary sendData = new Dictionary(); + Dictionary sendData = new Dictionary(); sendData["SCOPEID"] = scopeID.ToString(); sendData["NAME"] = name; @@ -396,7 +396,7 @@ namespace OpenSim.Services.Connectors public virtual List GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax) { - Dictionary sendData = new Dictionary(); + Dictionary sendData = new Dictionary(); sendData["SCOPEID"] = scopeID.ToString(); sendData["XMIN"] = xmin.ToString(); -- cgit v1.1 From 28d6705358c2e383fb46c57f064de4dcff144e33 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sat, 9 Jan 2010 20:46:32 +0000 Subject: Preliminary work on the new default region setting mechanism --- OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'OpenSim/Services/Connectors/Grid') diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs index 99aa3fb..7f1f2fd 100644 --- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs @@ -450,5 +450,19 @@ namespace OpenSim.Services.Connectors #endregion + public List GetDefaultRegions(UUID scopeID) + { + return null; + } + + public List GetFallbackRegions(UUID scopeID, int x, int y) + { + return null; + } + + public int GetRegionFlags(UUID scopeID, UUID regionID) + { + return 0; + } } } -- cgit v1.1 From 4bae547ecb67fcf74981ad85c02872dedc99f94a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 14 Jan 2010 06:36:39 -0800 Subject: Added the 2 missing methods in the grid service remote connections. --- .../Connectors/Grid/GridServiceConnector.cs | 101 ++++++++++++++++++++- 1 file changed, 97 insertions(+), 4 deletions(-) (limited to 'OpenSim/Services/Connectors/Grid') diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs index 7f1f2fd..cf112e1 100644 --- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs @@ -448,21 +448,114 @@ namespace OpenSim.Services.Connectors return rinfos; } - #endregion - public List GetDefaultRegions(UUID scopeID) { - return null; + Dictionary sendData = new Dictionary(); + + sendData["SCOPEID"] = scopeID.ToString(); + + sendData["METHOD"] = "get_default_regions"; + + List rinfos = new List(); + string reply = string.Empty; + try + { + reply = SynchronousRestFormsRequester.MakeRequest("POST", + m_ServerURI + "/grid", + ServerUtils.BuildQueryString(sendData)); + + //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply); + } + catch (Exception e) + { + m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); + return rinfos; + } + + if (reply != string.Empty) + { + Dictionary replyData = ServerUtils.ParseXmlResponse(reply); + + if (replyData != null) + { + Dictionary.ValueCollection rinfosList = replyData.Values; + foreach (object r in rinfosList) + { + if (r is Dictionary) + { + GridRegion rinfo = new GridRegion((Dictionary)r); + rinfos.Add(rinfo); + } + } + } + else + m_log.DebugFormat("[GRID CONNECTOR]: GetDefaultRegions {0} received null response", + scopeID); + } + else + m_log.DebugFormat("[GRID CONNECTOR]: GetDefaultRegions received null reply"); + + return rinfos; } public List GetFallbackRegions(UUID scopeID, int x, int y) { - return null; + Dictionary sendData = new Dictionary(); + + sendData["SCOPEID"] = scopeID.ToString(); + sendData["X"] = x.ToString(); + sendData["Y"] = y.ToString(); + + sendData["METHOD"] = "get_fallback_regions"; + + List rinfos = new List(); + string reply = string.Empty; + try + { + reply = SynchronousRestFormsRequester.MakeRequest("POST", + m_ServerURI + "/grid", + ServerUtils.BuildQueryString(sendData)); + + //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply); + } + catch (Exception e) + { + m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); + return rinfos; + } + + if (reply != string.Empty) + { + Dictionary replyData = ServerUtils.ParseXmlResponse(reply); + + if (replyData != null) + { + Dictionary.ValueCollection rinfosList = replyData.Values; + foreach (object r in rinfosList) + { + if (r is Dictionary) + { + GridRegion rinfo = new GridRegion((Dictionary)r); + rinfos.Add(rinfo); + } + } + } + else + m_log.DebugFormat("[GRID CONNECTOR]: GetFallbackRegions {0}, {1}-{2} received null response", + scopeID, x, y); + } + else + m_log.DebugFormat("[GRID CONNECTOR]: GetFallbackRegions received null reply"); + + return rinfos; } public int GetRegionFlags(UUID scopeID, UUID regionID) { return 0; } + + #endregion + } } -- cgit v1.1 From 04e29c1bacbc1e2df980ae15896a847ce7535da2 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 16 Jan 2010 21:42:44 -0800 Subject: Beginning of rewriting HG. Compiles, and runs, but HG functions not restored yet. --- OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'OpenSim/Services/Connectors/Grid') diff --git a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs index 7098b07..8b39171 100644 --- a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs @@ -55,6 +55,14 @@ namespace OpenSim.Services.Connectors.Grid m_AssetService = assService; } + public bool LinkRegion(GridRegion info, out UUID regionID, out ulong regionHandle, out string reason) + { + regionID = LinkRegion(info, out regionHandle); + // reason... + reason = string.Empty; + return true; + } + public UUID LinkRegion(GridRegion info, out ulong realHandle) { UUID uuid = UUID.Zero; -- cgit v1.1 From 6dceb8b4a98974a6869e2695e605caa31711e7a5 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 17 Jan 2010 07:37:43 -0800 Subject: These 2 were moved to corresponding Hypergrid folders. The server connector was renamed to Gatekeeper, because it will have all the handlers for the gatekeeper. --- .../Connectors/Grid/HypergridServiceConnector.cs | 262 --------------------- 1 file changed, 262 deletions(-) delete mode 100644 OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs (limited to 'OpenSim/Services/Connectors/Grid') diff --git a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs deleted file mode 100644 index 8b39171..0000000 --- a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs +++ /dev/null @@ -1,262 +0,0 @@ -/* - * 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 OpenSimulator 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.Collections; -using System.Collections.Generic; -using System.Text; -using System.Drawing; -using System.Net; -using System.Reflection; -using OpenSim.Services.Interfaces; -using GridRegion = OpenSim.Services.Interfaces.GridRegion; - -using OpenSim.Framework; - -using OpenMetaverse; -using OpenMetaverse.Imaging; -using log4net; -using Nwc.XmlRpc; - -namespace OpenSim.Services.Connectors.Grid -{ - public class HypergridServiceConnector - { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - - private IAssetService m_AssetService; - - public HypergridServiceConnector(IAssetService assService) - { - m_AssetService = assService; - } - - public bool LinkRegion(GridRegion info, out UUID regionID, out ulong regionHandle, out string reason) - { - regionID = LinkRegion(info, out regionHandle); - // reason... - reason = string.Empty; - return true; - } - - public UUID LinkRegion(GridRegion info, out ulong realHandle) - { - UUID uuid = UUID.Zero; - realHandle = 0; - - Hashtable hash = new Hashtable(); - hash["region_name"] = info.RegionName; - - IList paramList = new ArrayList(); - paramList.Add(hash); - - XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); - string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; - m_log.Debug("[HGrid]: Linking to " + uri); - XmlRpcResponse response = null; - try - { - response = request.Send(uri, 10000); - } - catch (Exception e) - { - m_log.Debug("[HGrid]: Exception " + e.Message); - return uuid; - } - - if (response.IsFault) - { - m_log.ErrorFormat("[HGrid]: remote call returned an error: {0}", response.FaultString); - } - else - { - hash = (Hashtable)response.Value; - //foreach (Object o in hash) - // m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); - try - { - UUID.TryParse((string)hash["uuid"], out uuid); - //m_log.Debug(">> HERE, uuid: " + uuid); - info.RegionID = uuid; - if ((string)hash["handle"] != null) - { - realHandle = Convert.ToUInt64((string)hash["handle"]); - //m_log.Debug(">> HERE, realHandle: " + realHandle); - } - //if (hash["region_image"] != null) - //{ - // UUID img = UUID.Zero; - // UUID.TryParse((string)hash["region_image"], out img); - // info.RegionSettings.TerrainImageID = img; - //} - if (hash["region_name"] != null) - { - info.RegionName = (string)hash["region_name"]; - //m_log.Debug(">> " + info.RegionName); - } - if (hash["internal_port"] != null) - { - int port = Convert.ToInt32((string)hash["internal_port"]); - info.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port); - //m_log.Debug(">> " + info.InternalEndPoint.ToString()); - } - - } - catch (Exception e) - { - m_log.Error("[HGrid]: Got exception while parsing hyperlink response " + e.StackTrace); - } - } - return uuid; - } - - public void GetMapImage(GridRegion info) - { - try - { - string regionimage = "regionImage" + info.RegionID.ToString(); - regionimage = regionimage.Replace("-", ""); - - WebClient c = new WebClient(); - string uri = "http://" + info.ExternalHostName + ":" + info.HttpPort + "/index.php?method=" + regionimage; - //m_log.Debug("JPEG: " + uri); - c.DownloadFile(uri, info.RegionID.ToString() + ".jpg"); - Bitmap m = new Bitmap(info.RegionID.ToString() + ".jpg"); - //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width); - byte[] imageData = OpenJPEG.EncodeFromImage(m, true); - AssetBase ass = new AssetBase(UUID.Random(), "region " + info.RegionID.ToString(), (sbyte)AssetType.Texture); - - // !!! for now - //info.RegionSettings.TerrainImageID = ass.FullID; - - ass.Temporary = true; - ass.Local = true; - ass.Data = imageData; - - m_AssetService.Store(ass); - - // finally - info.TerrainImage = ass.FullID; - - } - catch // LEGIT: Catching problems caused by OpenJPEG p/invoke - { - m_log.Warn("[HGrid]: Failed getting/storing map image, because it is probably already in the cache"); - } - } - - public bool InformRegionOfUser(GridRegion regInfo, AgentCircuitData agentData, GridRegion home, string userServer, string assetServer, string inventoryServer) - { - string capsPath = agentData.CapsPath; - Hashtable loginParams = new Hashtable(); - loginParams["session_id"] = agentData.SessionID.ToString(); - - loginParams["firstname"] = agentData.firstname; - loginParams["lastname"] = agentData.lastname; - - loginParams["agent_id"] = agentData.AgentID.ToString(); - loginParams["circuit_code"] = agentData.circuitcode.ToString(); - loginParams["startpos_x"] = agentData.startpos.X.ToString(); - loginParams["startpos_y"] = agentData.startpos.Y.ToString(); - loginParams["startpos_z"] = agentData.startpos.Z.ToString(); - loginParams["caps_path"] = capsPath; - - if (home != null) - { - loginParams["region_uuid"] = home.RegionID.ToString(); - loginParams["regionhandle"] = home.RegionHandle.ToString(); - loginParams["home_address"] = home.ExternalHostName; - loginParams["home_port"] = home.HttpPort.ToString(); - loginParams["internal_port"] = home.InternalEndPoint.Port.ToString(); - - m_log.Debug(" --------- Home -------"); - m_log.Debug(" >> " + loginParams["home_address"] + " <<"); - m_log.Debug(" >> " + loginParams["region_uuid"] + " <<"); - m_log.Debug(" >> " + loginParams["regionhandle"] + " <<"); - m_log.Debug(" >> " + loginParams["home_port"] + " <<"); - m_log.Debug(" --------- ------------ -------"); - } - else - m_log.WarnFormat("[HGrid]: Home region not found for {0} {1}", agentData.firstname, agentData.lastname); - - loginParams["userserver_id"] = userServer; - loginParams["assetserver_id"] = assetServer; - loginParams["inventoryserver_id"] = inventoryServer; - - - ArrayList SendParams = new ArrayList(); - SendParams.Add(loginParams); - - // Send - string uri = "http://" + regInfo.ExternalHostName + ":" + regInfo.HttpPort + "/"; - //m_log.Debug("XXX uri: " + uri); - XmlRpcRequest request = new XmlRpcRequest("expect_hg_user", SendParams); - XmlRpcResponse reply; - try - { - reply = request.Send(uri, 6000); - } - catch (Exception e) - { - m_log.Warn("[HGrid]: Failed to notify region about user. Reason: " + e.Message); - return false; - } - - if (!reply.IsFault) - { - bool responseSuccess = true; - if (reply.Value != null) - { - Hashtable resp = (Hashtable)reply.Value; - if (resp.ContainsKey("success")) - { - if ((string)resp["success"] == "FALSE") - { - responseSuccess = false; - } - } - } - if (responseSuccess) - { - m_log.Info("[HGrid]: Successfully informed remote region about user " + agentData.AgentID); - return true; - } - else - { - m_log.ErrorFormat("[HGrid]: Region responded that it is not available to receive clients"); - return false; - } - } - else - { - m_log.ErrorFormat("[HGrid]: XmlRpc request to region failed with message {0}, code {1} ", reply.FaultString, reply.FaultCode); - return false; - } - } - - } -} -- cgit v1.1 From 0c81966c0a8f69474fb542d7b4df1780ef756519 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 29 Jan 2010 09:12:22 -0800 Subject: Works for grid login. --- .../Connectors/Grid/GridServiceConnector.cs | 42 +++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) (limited to 'OpenSim/Services/Connectors/Grid') diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs index a1ca58e..7c8a3e2 100644 --- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs @@ -564,7 +564,47 @@ namespace OpenSim.Services.Connectors public int GetRegionFlags(UUID scopeID, UUID regionID) { - return 0; + Dictionary sendData = new Dictionary(); + + sendData["SCOPEID"] = scopeID.ToString(); + sendData["REGIONID"] = regionID.ToString(); + + sendData["METHOD"] = "get_region_flags"; + + string reply = string.Empty; + try + { + reply = SynchronousRestFormsRequester.MakeRequest("POST", + m_ServerURI + "/grid", + ServerUtils.BuildQueryString(sendData)); + } + catch (Exception e) + { + m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); + return -1; + } + + int flags = -1; + + if (reply != string.Empty) + { + Dictionary replyData = ServerUtils.ParseXmlResponse(reply); + + if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null)) + { + Int32.TryParse((string)replyData["result"], out flags); + //else + // m_log.DebugFormat("[GRID CONNECTOR]: GetRegionFlags {0}, {1} received wrong type {2}", + // scopeID, regionID, replyData["result"].GetType()); + } + else + m_log.DebugFormat("[GRID CONNECTOR]: GetRegionFlags {0}, {1} received null response", + scopeID, regionID); + } + else + m_log.DebugFormat("[GRID CONNECTOR]: GetRegionFlags received null reply"); + + return flags; } #endregion -- cgit v1.1 From 8466f13976bacad89e2babe4b7357e35f49a5739 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 1 Feb 2010 07:53:55 -0800 Subject: Bug fix for getting region flags. --- OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Services/Connectors/Grid') diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs index 7c8a3e2..a453d99 100644 --- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs @@ -562,7 +562,7 @@ namespace OpenSim.Services.Connectors return rinfos; } - public int GetRegionFlags(UUID scopeID, UUID regionID) + public virtual int GetRegionFlags(UUID scopeID, UUID regionID) { Dictionary sendData = new Dictionary(); -- cgit v1.1