aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer.Modules/UserManager.cs
diff options
context:
space:
mode:
authorAdam Frisby2009-05-23 06:05:20 +0000
committerAdam Frisby2009-05-23 06:05:20 +0000
commit31baeef469d72a9dc13cf4f56392b9f740f71cba (patch)
treeac50806ced72c5b296645bf061a3d9176a41075c /OpenSim/Grid/UserServer.Modules/UserManager.cs
parent* Breaks OpenSim.. err I mean.. adds NAT translation support to EnableSimulat... (diff)
downloadopensim-SC_OLD-31baeef469d72a9dc13cf4f56392b9f740f71cba.zip
opensim-SC_OLD-31baeef469d72a9dc13cf4f56392b9f740f71cba.tar.gz
opensim-SC_OLD-31baeef469d72a9dc13cf4f56392b9f740f71cba.tar.bz2
opensim-SC_OLD-31baeef469d72a9dc13cf4f56392b9f740f71cba.tar.xz
* Pipes requestors IP address through all XmlRpcRequest delegates. This is needed to be able to 'NAT-wrap' the login sequence.
* If you have something using XmlRpc that isn't in core, change your method signature from: (XmlRpcRequest request) to: (XmlRpcRequest request, IPEndPoint remoteClient)
Diffstat (limited to 'OpenSim/Grid/UserServer.Modules/UserManager.cs')
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserManager.cs15
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/UserManager.cs b/OpenSim/Grid/UserServer.Modules/UserManager.cs
index 6f2720a..8fb3de5 100644
--- a/OpenSim/Grid/UserServer.Modules/UserManager.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserManager.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net;
31using System.Reflection; 32using System.Reflection;
32using log4net; 33using log4net;
33using Nwc.XmlRpc; 34using Nwc.XmlRpc;
@@ -201,7 +202,7 @@ namespace OpenSim.Grid.UserServer.Modules
201 202
202 #region XMLRPC User Methods 203 #region XMLRPC User Methods
203 204
204 public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request) 205 public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request, IPEndPoint remoteClient)
205 { 206 {
206 // XmlRpcResponse response = new XmlRpcResponse(); 207 // XmlRpcResponse response = new XmlRpcResponse();
207 Hashtable requestData = (Hashtable)request.Params[0]; 208 Hashtable requestData = (Hashtable)request.Params[0];
@@ -218,7 +219,7 @@ namespace OpenSim.Grid.UserServer.Modules
218 return AvatarPickerListtoXmlRPCResponse(queryID, returnAvatar); 219 return AvatarPickerListtoXmlRPCResponse(queryID, returnAvatar);
219 } 220 }
220 221
221 public XmlRpcResponse XmlRPCAtRegion(XmlRpcRequest request) 222 public XmlRpcResponse XmlRPCAtRegion(XmlRpcRequest request, IPEndPoint remoteClient)
222 { 223 {
223 XmlRpcResponse response = new XmlRpcResponse(); 224 XmlRpcResponse response = new XmlRpcResponse();
224 Hashtable requestData = (Hashtable)request.Params[0]; 225 Hashtable requestData = (Hashtable)request.Params[0];
@@ -253,7 +254,7 @@ namespace OpenSim.Grid.UserServer.Modules
253 return response; 254 return response;
254 } 255 }
255 256
256 public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request) 257 public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request, IPEndPoint remoteClient)
257 { 258 {
258 // XmlRpcResponse response = new XmlRpcResponse(); 259 // XmlRpcResponse response = new XmlRpcResponse();
259 Hashtable requestData = (Hashtable)request.Params[0]; 260 Hashtable requestData = (Hashtable)request.Params[0];
@@ -290,7 +291,7 @@ namespace OpenSim.Grid.UserServer.Modules
290 return ProfileToXmlRPCResponse(userProfile); 291 return ProfileToXmlRPCResponse(userProfile);
291 } 292 }
292 293
293 public XmlRpcResponse XmlRPCGetUserMethodUUID(XmlRpcRequest request) 294 public XmlRpcResponse XmlRPCGetUserMethodUUID(XmlRpcRequest request, IPEndPoint remoteClient)
294 { 295 {
295 // XmlRpcResponse response = new XmlRpcResponse(); 296 // XmlRpcResponse response = new XmlRpcResponse();
296 Hashtable requestData = (Hashtable)request.Params[0]; 297 Hashtable requestData = (Hashtable)request.Params[0];
@@ -323,7 +324,7 @@ namespace OpenSim.Grid.UserServer.Modules
323 return ProfileToXmlRPCResponse(userProfile); 324 return ProfileToXmlRPCResponse(userProfile);
324 } 325 }
325 326
326 public XmlRpcResponse XmlRPCGetAgentMethodUUID(XmlRpcRequest request) 327 public XmlRpcResponse XmlRPCGetAgentMethodUUID(XmlRpcRequest request, IPEndPoint remoteClient)
327 { 328 {
328 XmlRpcResponse response = new XmlRpcResponse(); 329 XmlRpcResponse response = new XmlRpcResponse();
329 Hashtable requestData = (Hashtable)request.Params[0]; 330 Hashtable requestData = (Hashtable)request.Params[0];
@@ -372,7 +373,7 @@ namespace OpenSim.Grid.UserServer.Modules
372 return response; 373 return response;
373 } 374 }
374 375
375 public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserProfile(XmlRpcRequest request) 376 public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserProfile(XmlRpcRequest request, IPEndPoint remoteClient)
376 { 377 {
377 m_log.Debug("[UserManager]: Got request to update user profile"); 378 m_log.Debug("[UserManager]: Got request to update user profile");
378 XmlRpcResponse response = new XmlRpcResponse(); 379 XmlRpcResponse response = new XmlRpcResponse();
@@ -565,7 +566,7 @@ namespace OpenSim.Grid.UserServer.Modules
565 return response; 566 return response;
566 } 567 }
567 568
568 public XmlRpcResponse XmlRPCLogOffUserMethodUUID(XmlRpcRequest request) 569 public XmlRpcResponse XmlRPCLogOffUserMethodUUID(XmlRpcRequest request, IPEndPoint remoteClient)
569 { 570 {
570 XmlRpcResponse response = new XmlRpcResponse(); 571 XmlRpcResponse response = new XmlRpcResponse();
571 Hashtable requestData = (Hashtable)request.Params[0]; 572 Hashtable requestData = (Hashtable)request.Params[0];