diff options
author | Diva Canto | 2010-01-18 20:35:59 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-18 20:35:59 -0800 |
commit | 9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8 (patch) | |
tree | b81216bbac54d79b6011657ed58e7957f0d1f13e /OpenSim/Server/Handlers/Hypergrid | |
parent | Check for impersonations at the Gatekeeper. (diff) | |
download | opensim-SC_OLD-9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8.zip opensim-SC_OLD-9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8.tar.gz opensim-SC_OLD-9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8.tar.bz2 opensim-SC_OLD-9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8.tar.xz |
* Towards enabling hyperlinks at grid-level.
* Updated grid configs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs | 11 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | 34 |
2 files changed, 42 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs index 15b29d2..940ec7a 100644 --- a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs | |||
@@ -51,6 +51,8 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
51 | get { return m_GatekeeperService; } | 51 | get { return m_GatekeeperService; } |
52 | } | 52 | } |
53 | 53 | ||
54 | private IHypergridService m_HypergridService; | ||
55 | |||
54 | public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server, ISimulationService simService) : | 56 | public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server, ISimulationService simService) : |
55 | base(config, server, String.Empty) | 57 | base(config, server, String.Empty) |
56 | { | 58 | { |
@@ -60,12 +62,17 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
60 | string serviceDll = gridConfig.GetString("LocalServiceModule", string.Empty); | 62 | string serviceDll = gridConfig.GetString("LocalServiceModule", string.Empty); |
61 | Object[] args = new Object[] { config, simService }; | 63 | Object[] args = new Object[] { config, simService }; |
62 | m_GatekeeperService = ServerUtils.LoadPlugin<IGatekeeperService>(serviceDll, args); | 64 | m_GatekeeperService = ServerUtils.LoadPlugin<IGatekeeperService>(serviceDll, args); |
65 | |||
66 | serviceDll = gridConfig.GetString("HypergridService", string.Empty); | ||
67 | m_HypergridService = ServerUtils.LoadPlugin<IHypergridService>(serviceDll, args); | ||
68 | |||
63 | } | 69 | } |
64 | if (m_GatekeeperService == null) | 70 | if (m_GatekeeperService == null || m_HypergridService == null) |
65 | throw new Exception("Gatekeeper server connector cannot proceed because of missing service"); | 71 | throw new Exception("Gatekeeper server connector cannot proceed because of missing service"); |
66 | 72 | ||
67 | HypergridHandlers hghandlers = new HypergridHandlers(m_GatekeeperService); | 73 | HypergridHandlers hghandlers = new HypergridHandlers(m_GatekeeperService, m_HypergridService); |
68 | server.AddXmlRPCHandler("link_region", hghandlers.LinkRegionRequest, false); | 74 | server.AddXmlRPCHandler("link_region", hghandlers.LinkRegionRequest, false); |
75 | server.AddXmlRPCHandler("link_region_by_desc", hghandlers.LinkRegionByDescRequest, false); | ||
69 | server.AddXmlRPCHandler("get_region", hghandlers.GetRegion, false); | 76 | server.AddXmlRPCHandler("get_region", hghandlers.GetRegion, false); |
70 | server.AddXmlRPCHandler("get_home_region", hghandlers.GetHomeRegion, false); | 77 | server.AddXmlRPCHandler("get_home_region", hghandlers.GetHomeRegion, false); |
71 | 78 | ||
diff --git a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs index 846d1c2..1d711a8 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | |||
@@ -44,10 +44,12 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | private IGatekeeperService m_GatekeeperService; | 46 | private IGatekeeperService m_GatekeeperService; |
47 | private IHypergridService m_HypergridService; | ||
47 | 48 | ||
48 | public HypergridHandlers(IGatekeeperService gatekeeper) | 49 | public HypergridHandlers(IGatekeeperService gatekeeper, IHypergridService hyper) |
49 | { | 50 | { |
50 | m_GatekeeperService = gatekeeper; | 51 | m_GatekeeperService = gatekeeper; |
52 | m_HypergridService = hyper; | ||
51 | } | 53 | } |
52 | 54 | ||
53 | /// <summary> | 55 | /// <summary> |
@@ -80,6 +82,36 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
80 | return response; | 82 | return response; |
81 | } | 83 | } |
82 | 84 | ||
85 | /// <summary> | ||
86 | /// A local region wants to establish a grid-wide hyperlink to another region | ||
87 | /// </summary> | ||
88 | /// <param name="request"></param> | ||
89 | /// <returns></returns> | ||
90 | public XmlRpcResponse LinkRegionByDescRequest(XmlRpcRequest request, IPEndPoint remoteClient) | ||
91 | { | ||
92 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
93 | //string host = (string)requestData["host"]; | ||
94 | //string portstr = (string)requestData["port"]; | ||
95 | string descriptor = (string)requestData["region_desc"]; | ||
96 | |||
97 | UUID regionID = UUID.Zero; | ||
98 | string imageURL = string.Empty; | ||
99 | ulong regionHandle = 0; | ||
100 | string reason = string.Empty; | ||
101 | |||
102 | bool success = m_HypergridService.LinkRegion(descriptor, out regionID, out regionHandle, out imageURL, out reason); | ||
103 | |||
104 | Hashtable hash = new Hashtable(); | ||
105 | hash["result"] = success.ToString(); | ||
106 | hash["uuid"] = regionID.ToString(); | ||
107 | hash["handle"] = regionHandle.ToString(); | ||
108 | hash["region_image"] = imageURL; | ||
109 | |||
110 | XmlRpcResponse response = new XmlRpcResponse(); | ||
111 | response.Value = hash; | ||
112 | return response; | ||
113 | } | ||
114 | |||
83 | public XmlRpcResponse GetRegion(XmlRpcRequest request, IPEndPoint remoteClient) | 115 | public XmlRpcResponse GetRegion(XmlRpcRequest request, IPEndPoint remoteClient) |
84 | { | 116 | { |
85 | Hashtable requestData = (Hashtable)request.Params[0]; | 117 | Hashtable requestData = (Hashtable)request.Params[0]; |