aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer.Modules
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
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')
-rw-r--r--OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs14
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserLoginService.cs3
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserManager.cs15
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs5
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs9
5 files changed, 25 insertions, 21 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
index 330ced2..f326100 100644
--- a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
@@ -166,7 +166,7 @@ namespace OpenSim.Grid.UserServer.Modules
166 } 166 }
167 167
168 } 168 }
169 public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request) 169 public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request, IPEndPoint remoteClient)
170 { 170 {
171 XmlRpcResponse response = new XmlRpcResponse(); 171 XmlRpcResponse response = new XmlRpcResponse();
172 Hashtable requestData = (Hashtable)request.Params[0]; 172 Hashtable requestData = (Hashtable)request.Params[0];
@@ -187,7 +187,7 @@ namespace OpenSim.Grid.UserServer.Modules
187 } 187 }
188 return response; 188 return response;
189 } 189 }
190 public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request) 190 public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request, IPEndPoint remoteClient)
191 { 191 {
192 XmlRpcResponse response = new XmlRpcResponse(); 192 XmlRpcResponse response = new XmlRpcResponse();
193 Hashtable requestData = (Hashtable)request.Params[0]; 193 Hashtable requestData = (Hashtable)request.Params[0];
@@ -203,7 +203,7 @@ namespace OpenSim.Grid.UserServer.Modules
203 } 203 }
204 return response; 204 return response;
205 } 205 }
206 public XmlRpcResponse XmlRPCUserMovedtoRegion(XmlRpcRequest request) 206 public XmlRpcResponse XmlRPCUserMovedtoRegion(XmlRpcRequest request, IPEndPoint remoteClient)
207 { 207 {
208 XmlRpcResponse response = new XmlRpcResponse(); 208 XmlRpcResponse response = new XmlRpcResponse();
209 Hashtable requestData = (Hashtable)request.Params[0]; 209 Hashtable requestData = (Hashtable)request.Params[0];
@@ -430,7 +430,7 @@ namespace OpenSim.Grid.UserServer.Modules
430 } 430 }
431 } 431 }
432 432
433 public XmlRpcResponse RegionStartup(XmlRpcRequest request) 433 public XmlRpcResponse RegionStartup(XmlRpcRequest request, IPEndPoint remoteClient)
434 { 434 {
435 Hashtable requestData = (Hashtable)request.Params[0]; 435 Hashtable requestData = (Hashtable)request.Params[0];
436 Hashtable result = new Hashtable(); 436 Hashtable result = new Hashtable();
@@ -449,7 +449,7 @@ namespace OpenSim.Grid.UserServer.Modules
449 return response; 449 return response;
450 } 450 }
451 451
452 public XmlRpcResponse RegionShutdown(XmlRpcRequest request) 452 public XmlRpcResponse RegionShutdown(XmlRpcRequest request, IPEndPoint remoteClient)
453 { 453 {
454 Hashtable requestData = (Hashtable)request.Params[0]; 454 Hashtable requestData = (Hashtable)request.Params[0];
455 Hashtable result = new Hashtable(); 455 Hashtable result = new Hashtable();
@@ -468,7 +468,7 @@ namespace OpenSim.Grid.UserServer.Modules
468 return response; 468 return response;
469 } 469 }
470 470
471 public XmlRpcResponse AgentLocation(XmlRpcRequest request) 471 public XmlRpcResponse AgentLocation(XmlRpcRequest request, IPEndPoint remoteClient)
472 { 472 {
473 Hashtable requestData = (Hashtable)request.Params[0]; 473 Hashtable requestData = (Hashtable)request.Params[0];
474 Hashtable result = new Hashtable(); 474 Hashtable result = new Hashtable();
@@ -489,7 +489,7 @@ namespace OpenSim.Grid.UserServer.Modules
489 return response; 489 return response;
490 } 490 }
491 491
492 public XmlRpcResponse AgentLeaving(XmlRpcRequest request) 492 public XmlRpcResponse AgentLeaving(XmlRpcRequest request, IPEndPoint remoteClient)
493 { 493 {
494 Hashtable requestData = (Hashtable)request.Params[0]; 494 Hashtable requestData = (Hashtable)request.Params[0];
495 Hashtable result = new Hashtable(); 495 Hashtable result = new Hashtable();
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
index 9eb8743..8fd9c6d 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.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 System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
33using log4net; 34using log4net;
@@ -368,7 +369,7 @@ namespace OpenSim.Grid.UserServer.Modules
368 return true; 369 return true;
369 } 370 }
370 371
371 public XmlRpcResponse XmlRPCSetLoginParams(XmlRpcRequest request) 372 public XmlRpcResponse XmlRPCSetLoginParams(XmlRpcRequest request, IPEndPoint remoteClient)
372 { 373 {
373 XmlRpcResponse response = new XmlRpcResponse(); 374 XmlRpcResponse response = new XmlRpcResponse();
374 Hashtable requestData = (Hashtable)request.Params[0]; 375 Hashtable requestData = (Hashtable)request.Params[0];
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];
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs
index 4ed8597..a7ebc85 100644
--- a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.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;
@@ -70,7 +71,7 @@ namespace OpenSim.Grid.UserServer.Modules
70 m_httpServer.AddXmlRPCHandler("update_avatar_appearance", XmlRPCUpdateAvatarAppearance); 71 m_httpServer.AddXmlRPCHandler("update_avatar_appearance", XmlRPCUpdateAvatarAppearance);
71 } 72 }
72 73
73 public XmlRpcResponse XmlRPCGetAvatarAppearance(XmlRpcRequest request) 74 public XmlRpcResponse XmlRPCGetAvatarAppearance(XmlRpcRequest request, IPEndPoint remoteClient)
74 { 75 {
75 XmlRpcResponse response = new XmlRpcResponse(); 76 XmlRpcResponse response = new XmlRpcResponse();
76 Hashtable requestData = (Hashtable)request.Params[0]; 77 Hashtable requestData = (Hashtable)request.Params[0];
@@ -101,7 +102,7 @@ namespace OpenSim.Grid.UserServer.Modules
101 return response; 102 return response;
102 } 103 }
103 104
104 public XmlRpcResponse XmlRPCUpdateAvatarAppearance(XmlRpcRequest request) 105 public XmlRpcResponse XmlRPCUpdateAvatarAppearance(XmlRpcRequest request, IPEndPoint remoteClient)
105 { 106 {
106 XmlRpcResponse response = new XmlRpcResponse(); 107 XmlRpcResponse response = new XmlRpcResponse();
107 Hashtable requestData = (Hashtable)request.Params[0]; 108 Hashtable requestData = (Hashtable)request.Params[0];
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs
index 1684eb7..c860834 100644
--- a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.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;
@@ -93,7 +94,7 @@ namespace OpenSim.Grid.UserServer.Modules
93 return response; 94 return response;
94 } 95 }
95 96
96 public XmlRpcResponse XmlRpcResponseXmlRPCAddUserFriend(XmlRpcRequest request) 97 public XmlRpcResponse XmlRpcResponseXmlRPCAddUserFriend(XmlRpcRequest request, IPEndPoint remoteClient)
97 { 98 {
98 XmlRpcResponse response = new XmlRpcResponse(); 99 XmlRpcResponse response = new XmlRpcResponse();
99 Hashtable requestData = (Hashtable)request.Params[0]; 100 Hashtable requestData = (Hashtable)request.Params[0];
@@ -115,7 +116,7 @@ namespace OpenSim.Grid.UserServer.Modules
115 return response; 116 return response;
116 } 117 }
117 118
118 public XmlRpcResponse XmlRpcResponseXmlRPCRemoveUserFriend(XmlRpcRequest request) 119 public XmlRpcResponse XmlRpcResponseXmlRPCRemoveUserFriend(XmlRpcRequest request, IPEndPoint remoteClient)
119 { 120 {
120 XmlRpcResponse response = new XmlRpcResponse(); 121 XmlRpcResponse response = new XmlRpcResponse();
121 Hashtable requestData = (Hashtable)request.Params[0]; 122 Hashtable requestData = (Hashtable)request.Params[0];
@@ -135,7 +136,7 @@ namespace OpenSim.Grid.UserServer.Modules
135 return response; 136 return response;
136 } 137 }
137 138
138 public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserFriendPerms(XmlRpcRequest request) 139 public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserFriendPerms(XmlRpcRequest request, IPEndPoint remoteClient)
139 { 140 {
140 XmlRpcResponse response = new XmlRpcResponse(); 141 XmlRpcResponse response = new XmlRpcResponse();
141 Hashtable requestData = (Hashtable)request.Params[0]; 142 Hashtable requestData = (Hashtable)request.Params[0];
@@ -156,7 +157,7 @@ namespace OpenSim.Grid.UserServer.Modules
156 return response; 157 return response;
157 } 158 }
158 159
159 public XmlRpcResponse XmlRpcResponseXmlRPCGetUserFriendList(XmlRpcRequest request) 160 public XmlRpcResponse XmlRpcResponseXmlRPCGetUserFriendList(XmlRpcRequest request, IPEndPoint remoteClient)
160 { 161 {
161 // XmlRpcResponse response = new XmlRpcResponse(); 162 // XmlRpcResponse response = new XmlRpcResponse();
162 Hashtable requestData = (Hashtable)request.Params[0]; 163 Hashtable requestData = (Hashtable)request.Params[0];