diff options
author | Melanie | 2009-09-28 23:03:47 +0100 |
---|---|---|
committer | Melanie | 2009-09-28 23:03:47 +0100 |
commit | 07091493134341a316624d9a1f6a2ef1cfa2f2d8 (patch) | |
tree | 1d394e128be9766656a441058b2bdf141ba90269 /OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs | |
parent | Allow the notation config_name@port/dll_name:class_name as a handler spec (diff) | |
parent | Forgot a return statement. (diff) | |
download | opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.zip opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.gz opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.bz2 opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.xz |
Merge branch 'grid-service-redux'
Diffstat (limited to 'OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs | 124 |
1 files changed, 110 insertions, 14 deletions
diff --git a/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs b/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs index ad63485..c47f652 100644 --- a/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs +++ b/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs | |||
@@ -36,7 +36,9 @@ using OpenSim.Server.Base; | |||
36 | using OpenSim.Services.Interfaces; | 36 | using OpenSim.Services.Interfaces; |
37 | using OpenSim.Framework.Servers.HttpServer; | 37 | using OpenSim.Framework.Servers.HttpServer; |
38 | using OpenSim.Server.Handlers.Base; | 38 | using OpenSim.Server.Handlers.Base; |
39 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
39 | 40 | ||
41 | using OpenMetaverse; | ||
40 | using log4net; | 42 | using log4net; |
41 | using Nwc.XmlRpc; | 43 | using Nwc.XmlRpc; |
42 | 44 | ||
@@ -48,12 +50,26 @@ namespace OpenSim.Server.Handlers.Grid | |||
48 | LogManager.GetLogger( | 50 | LogManager.GetLogger( |
49 | MethodBase.GetCurrentMethod().DeclaringType); | 51 | MethodBase.GetCurrentMethod().DeclaringType); |
50 | 52 | ||
51 | private List<SimpleRegionInfo> m_RegionsOnSim = new List<SimpleRegionInfo>(); | 53 | private List<GridRegion> m_RegionsOnSim = new List<GridRegion>(); |
54 | private IHyperlinkService m_HyperlinkService; | ||
52 | 55 | ||
53 | public HypergridServiceInConnector(IConfigSource config, IHttpServer server) : | 56 | public HypergridServiceInConnector(IConfigSource config, IHttpServer server, IHyperlinkService hyperService) : |
54 | base(config, server) | 57 | base(config, server) |
55 | { | 58 | { |
56 | server.AddXmlRPCHandler("linkk_region", LinkRegionRequest, false); | 59 | m_HyperlinkService = hyperService; |
60 | server.AddXmlRPCHandler("link_region", LinkRegionRequest, false); | ||
61 | server.AddXmlRPCHandler("expect_hg_user", ExpectHGUser, false); | ||
62 | } | ||
63 | |||
64 | public void AddRegion(GridRegion rinfo) | ||
65 | { | ||
66 | m_RegionsOnSim.Add(rinfo); | ||
67 | } | ||
68 | |||
69 | public void RemoveRegion(GridRegion rinfo) | ||
70 | { | ||
71 | if (m_RegionsOnSim.Contains(rinfo)) | ||
72 | m_RegionsOnSim.Remove(rinfo); | ||
57 | } | 73 | } |
58 | 74 | ||
59 | /// <summary> | 75 | /// <summary> |
@@ -70,8 +86,8 @@ namespace OpenSim.Server.Handlers.Grid | |||
70 | 86 | ||
71 | m_log.DebugFormat("[HGrid]: Hyperlink request"); | 87 | m_log.DebugFormat("[HGrid]: Hyperlink request"); |
72 | 88 | ||
73 | SimpleRegionInfo regInfo = null; | 89 | GridRegion regInfo = null; |
74 | foreach (SimpleRegionInfo r in m_RegionsOnSim) | 90 | foreach (GridRegion r in m_RegionsOnSim) |
75 | { | 91 | { |
76 | if ((r.RegionName != null) && (name != null) && (r.RegionName.ToLower() == name.ToLower())) | 92 | if ((r.RegionName != null) && (name != null) && (r.RegionName.ToLower() == name.ToLower())) |
77 | { | 93 | { |
@@ -85,9 +101,9 @@ namespace OpenSim.Server.Handlers.Grid | |||
85 | 101 | ||
86 | Hashtable hash = new Hashtable(); | 102 | Hashtable hash = new Hashtable(); |
87 | hash["uuid"] = regInfo.RegionID.ToString(); | 103 | hash["uuid"] = regInfo.RegionID.ToString(); |
104 | m_log.Debug(">> Here " + regInfo.RegionID); | ||
88 | hash["handle"] = regInfo.RegionHandle.ToString(); | 105 | hash["handle"] = regInfo.RegionHandle.ToString(); |
89 | //m_log.Debug(">> Here " + regInfo.RegionHandle); | 106 | hash["region_image"] = regInfo.TerrainImage.ToString(); |
90 | //hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString(); | ||
91 | hash["region_name"] = regInfo.RegionName; | 107 | hash["region_name"] = regInfo.RegionName; |
92 | hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); | 108 | hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); |
93 | //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port); | 109 | //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port); |
@@ -98,15 +114,95 @@ namespace OpenSim.Server.Handlers.Grid | |||
98 | return response; | 114 | return response; |
99 | } | 115 | } |
100 | 116 | ||
101 | public void AddRegion(SimpleRegionInfo rinfo) | 117 | /// <summary> |
118 | /// Received from other HGrid nodes when a user wants to teleport here. This call allows | ||
119 | /// the region to prepare for direct communication from the client. Sends back an empty | ||
120 | /// xmlrpc response on completion. | ||
121 | /// This is somewhat similar to OGS1's ExpectUser, but with the additional task of | ||
122 | /// registering the user in the local user cache. | ||
123 | /// </summary> | ||
124 | /// <param name="request"></param> | ||
125 | /// <returns></returns> | ||
126 | public XmlRpcResponse ExpectHGUser(XmlRpcRequest request, IPEndPoint remoteClient) | ||
102 | { | 127 | { |
103 | m_RegionsOnSim.Add(rinfo); | 128 | Hashtable requestData = (Hashtable)request.Params[0]; |
104 | } | 129 | ForeignUserProfileData userData = new ForeignUserProfileData(); |
105 | 130 | ||
106 | public void RemoveRegion(SimpleRegionInfo rinfo) | 131 | userData.FirstName = (string)requestData["firstname"]; |
107 | { | 132 | userData.SurName = (string)requestData["lastname"]; |
108 | if (m_RegionsOnSim.Contains(rinfo)) | 133 | userData.ID = new UUID((string)requestData["agent_id"]); |
109 | m_RegionsOnSim.Remove(rinfo); | 134 | UUID sessionID = new UUID((string)requestData["session_id"]); |
135 | userData.HomeLocation = new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]), | ||
136 | (float)Convert.ToDecimal((string)requestData["startpos_y"]), | ||
137 | (float)Convert.ToDecimal((string)requestData["startpos_z"])); | ||
138 | |||
139 | userData.UserServerURI = (string)requestData["userserver_id"]; | ||
140 | userData.UserAssetURI = (string)requestData["assetserver_id"]; | ||
141 | userData.UserInventoryURI = (string)requestData["inventoryserver_id"]; | ||
142 | |||
143 | m_log.DebugFormat("[HGrid]: Prepare for connection from {0} {1} (@{2}) UUID={3}", | ||
144 | userData.FirstName, userData.SurName, userData.UserServerURI, userData.ID); | ||
145 | |||
146 | ulong userRegionHandle = 0; | ||
147 | int userhomeinternalport = 0; | ||
148 | if (requestData.ContainsKey("region_uuid")) | ||
149 | { | ||
150 | UUID uuid = UUID.Zero; | ||
151 | UUID.TryParse((string)requestData["region_uuid"], out uuid); | ||
152 | userData.HomeRegionID = uuid; | ||
153 | userRegionHandle = Convert.ToUInt64((string)requestData["regionhandle"]); | ||
154 | userData.UserHomeAddress = (string)requestData["home_address"]; | ||
155 | userData.UserHomePort = (string)requestData["home_port"]; | ||
156 | userhomeinternalport = Convert.ToInt32((string)requestData["internal_port"]); | ||
157 | |||
158 | m_log.Debug("[HGrid]: home_address: " + userData.UserHomeAddress + | ||
159 | "; home_port: " + userData.UserHomePort); | ||
160 | } | ||
161 | else | ||
162 | m_log.WarnFormat("[HGrid]: User has no home region information"); | ||
163 | |||
164 | XmlRpcResponse resp = new XmlRpcResponse(); | ||
165 | |||
166 | // Let's check if someone is trying to get in with a stolen local identity. | ||
167 | // The need for this test is a consequence of not having truly global names :-/ | ||
168 | bool comingHome = false; | ||
169 | if (m_HyperlinkService.CheckUserAtEntry(userData.ID, sessionID, out comingHome) == false) | ||
170 | { | ||
171 | m_log.WarnFormat("[HGrid]: Access denied to foreign user."); | ||
172 | Hashtable respdata = new Hashtable(); | ||
173 | respdata["success"] = "FALSE"; | ||
174 | respdata["reason"] = "Foreign user has the same ID as a local user, or logins disabled."; | ||
175 | resp.Value = respdata; | ||
176 | return resp; | ||
177 | } | ||
178 | |||
179 | // Finally, everything looks ok | ||
180 | //m_log.Debug("XXX---- EVERYTHING OK ---XXX"); | ||
181 | |||
182 | if (!comingHome) | ||
183 | { | ||
184 | // We don't do this if the user is coming to the home grid | ||
185 | GridRegion home = new GridRegion(); | ||
186 | home.RegionID = userData.HomeRegionID; | ||
187 | home.ExternalHostName = userData.UserHomeAddress; | ||
188 | home.HttpPort = Convert.ToUInt32(userData.UserHomePort); | ||
189 | uint x = 0, y = 0; | ||
190 | Utils.LongToUInts(userRegionHandle, out x, out y); | ||
191 | home.RegionLocX = (int)x; | ||
192 | home.RegionLocY = (int)y; | ||
193 | home.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)userhomeinternalport); | ||
194 | |||
195 | m_HyperlinkService.AcceptUser(userData, home); | ||
196 | } | ||
197 | // else the user is coming to a non-home region of the home grid | ||
198 | // We simply drop this user information altogether | ||
199 | |||
200 | Hashtable respdata2 = new Hashtable(); | ||
201 | respdata2["success"] = "TRUE"; | ||
202 | resp.Value = respdata2; | ||
203 | |||
204 | return resp; | ||
110 | } | 205 | } |
206 | |||
111 | } | 207 | } |
112 | } | 208 | } |