aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
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/Region
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 '')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs4
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs6
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs3
-rw-r--r--OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs3
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs3
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs2
-rw-r--r--OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs11
10 files changed, 24 insertions, 19 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index 3c1be0b..7b116ca 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -523,7 +523,7 @@ namespace OpenSim.Region.Communications.Hypergrid
523 /// </summary> 523 /// </summary>
524 /// <param name="request"></param> 524 /// <param name="request"></param>
525 /// <returns></returns> 525 /// <returns></returns>
526 public XmlRpcResponse LinkRegionRequest(XmlRpcRequest request) 526 public XmlRpcResponse LinkRegionRequest(XmlRpcRequest request, IPEndPoint remoteClient)
527 { 527 {
528 Hashtable requestData = (Hashtable)request.Params[0]; 528 Hashtable requestData = (Hashtable)request.Params[0];
529 //string host = (string)requestData["host"]; 529 //string host = (string)requestData["host"];
@@ -710,7 +710,7 @@ namespace OpenSim.Region.Communications.Hypergrid
710 /// </summary> 710 /// </summary>
711 /// <param name="request"></param> 711 /// <param name="request"></param>
712 /// <returns></returns> 712 /// <returns></returns>
713 public XmlRpcResponse ExpectHGUser(XmlRpcRequest request) 713 public XmlRpcResponse ExpectHGUser(XmlRpcRequest request, IPEndPoint remoteClient)
714 { 714 {
715 Hashtable requestData = (Hashtable)request.Params[0]; 715 Hashtable requestData = (Hashtable)request.Params[0];
716 ForeignUserProfileData userData = new ForeignUserProfileData(); 716 ForeignUserProfileData userData = new ForeignUserProfileData();
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
index 4dcfb2a..75a78d5 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
@@ -177,7 +177,7 @@ namespace OpenSim.Region.Communications.Hypergrid
177 /// </summary> 177 /// </summary>
178 /// <param name="request"></param> 178 /// <param name="request"></param>
179 /// <returns></returns> 179 /// <returns></returns>
180 public virtual XmlRpcResponse PingCheckReply(XmlRpcRequest request) 180 public virtual XmlRpcResponse PingCheckReply(XmlRpcRequest request, IPEndPoint remoteClient)
181 { 181 {
182 XmlRpcResponse response = new XmlRpcResponse(); 182 XmlRpcResponse response = new XmlRpcResponse();
183 183
@@ -198,7 +198,7 @@ namespace OpenSim.Region.Communications.Hypergrid
198 /// </summary> 198 /// </summary>
199 /// <param name="request"></param> 199 /// <param name="request"></param>
200 /// <returns></returns> 200 /// <returns></returns>
201 public XmlRpcResponse LogOffUser(XmlRpcRequest request) 201 public XmlRpcResponse LogOffUser(XmlRpcRequest request, IPEndPoint remoteClient)
202 { 202 {
203 m_log.Debug("[HGrid]: LogOff User Called"); 203 m_log.Debug("[HGrid]: LogOff User Called");
204 204
@@ -221,7 +221,7 @@ namespace OpenSim.Region.Communications.Hypergrid
221 /// </summary> 221 /// </summary>
222 /// <param name="request"></param> 222 /// <param name="request"></param>
223 /// <returns></returns> 223 /// <returns></returns>
224 public XmlRpcResponse LandData(XmlRpcRequest request) 224 public XmlRpcResponse LandData(XmlRpcRequest request, IPEndPoint remoteClient)
225 { 225 {
226 Hashtable requestData = (Hashtable)request.Params[0]; 226 Hashtable requestData = (Hashtable)request.Params[0];
227 ulong regionHandle = Convert.ToUInt64(requestData["region_handle"]); 227 ulong regionHandle = Convert.ToUInt64(requestData["region_handle"]);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 684d42b..ed88a6e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -616,7 +616,7 @@ namespace OpenSim.Region.Communications.OGS1
616 /// </summary> 616 /// </summary>
617 /// <param name="request"></param> 617 /// <param name="request"></param>
618 /// <returns></returns> 618 /// <returns></returns>
619 public XmlRpcResponse PingCheckReply(XmlRpcRequest request) 619 public XmlRpcResponse PingCheckReply(XmlRpcRequest request, IPEndPoint remoteClient)
620 { 620 {
621 XmlRpcResponse response = new XmlRpcResponse(); 621 XmlRpcResponse response = new XmlRpcResponse();
622 622
@@ -838,7 +838,7 @@ namespace OpenSim.Region.Communications.OGS1
838 /// </summary> 838 /// </summary>
839 /// <param name="request"></param> 839 /// <param name="request"></param>
840 /// <returns></returns> 840 /// <returns></returns>
841 public XmlRpcResponse LandData(XmlRpcRequest request) 841 public XmlRpcResponse LandData(XmlRpcRequest request, IPEndPoint remoteClient)
842 { 842 {
843 Hashtable requestData = (Hashtable)request.Params[0]; 843 Hashtable requestData = (Hashtable)request.Params[0];
844 ulong regionHandle = Convert.ToUInt64(requestData["region_handle"]); 844 ulong regionHandle = Convert.ToUInt64(requestData["region_handle"]);
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index e46545c..4793734 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.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 Nini.Config; 34using Nini.Config;
@@ -250,7 +251,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
250 /// </summary> 251 /// </summary>
251 /// <param name="req"></param> 252 /// <param name="req"></param>
252 /// <returns></returns> 253 /// <returns></returns>
253 public XmlRpcResponse processPresenceUpdateBulk(XmlRpcRequest req) 254 public XmlRpcResponse processPresenceUpdateBulk(XmlRpcRequest req, IPEndPoint remoteClient)
254 { 255 {
255 Hashtable requestData = (Hashtable)req.Params[0]; 256 Hashtable requestData = (Hashtable)req.Params[0];
256 257
@@ -319,7 +320,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
319 return response; 320 return response;
320 } 321 }
321 322
322 public XmlRpcResponse processTerminateFriend(XmlRpcRequest req) 323 public XmlRpcResponse processTerminateFriend(XmlRpcRequest req, IPEndPoint remoteClient)
323 { 324 {
324 Hashtable requestData = (Hashtable)req.Params[0]; 325 Hashtable requestData = (Hashtable)req.Params[0];
325 326
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 23aaabe..7d9e1f1 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -180,7 +180,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
180 /// <param name="request">XMLRPC parameters 180 /// <param name="request">XMLRPC parameters
181 /// </param> 181 /// </param>
182 /// <returns>Nothing much</returns> 182 /// <returns>Nothing much</returns>
183 protected virtual XmlRpcResponse processXMLRPCGridInstantMessage(XmlRpcRequest request) 183 protected virtual XmlRpcResponse processXMLRPCGridInstantMessage(XmlRpcRequest request, IPEndPoint remoteClient)
184 { 184 {
185 bool successful = false; 185 bool successful = false;
186 186
diff --git a/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs b/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs
index 5266e0a..ccad89a 100644
--- a/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs
+++ b/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.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 Nini.Config; 34using Nini.Config;
@@ -135,7 +136,7 @@ namespace OpenSim.Region.CoreModules.Framework.Services
135 /// </summary> 136 /// </summary>
136 /// <param name="request"></param> 137 /// <param name="request"></param>
137 /// <returns></returns> 138 /// <returns></returns>
138 public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request) 139 public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request, IPEndPoint remoteClient)
139 { 140 {
140 Hashtable requestData = (Hashtable)request.Params[0]; 141 Hashtable requestData = (Hashtable)request.Params[0];
141 Hashtable responseData = new Hashtable(); 142 Hashtable responseData = new Hashtable();
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index 8f1ec22..f7e57a9 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.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.Threading; 33using System.Threading;
33using log4net; 34using log4net;
@@ -404,7 +405,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
404 405
405 #endregion 406 #endregion
406 407
407 public XmlRpcResponse XmlRpcRemoteData(XmlRpcRequest request) 408 public XmlRpcResponse XmlRpcRemoteData(XmlRpcRequest request, IPEndPoint remoteClient)
408 { 409 {
409 XmlRpcResponse response = new XmlRpcResponse(); 410 XmlRpcResponse response = new XmlRpcResponse();
410 411
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
index 5ebbd7b..61fac94 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.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 Nini.Config; 34using Nini.Config;
@@ -135,7 +136,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
135 } 136 }
136 #endregion 137 #endregion
137 138
138 public static XmlRpcResponse XmlRpcAdminMethod(XmlRpcRequest request) 139 public static XmlRpcResponse XmlRpcAdminMethod(XmlRpcRequest request, IPEndPoint remoteClient)
139 { 140 {
140 m_log.Info("[IRC-Bridge]: XML RPC Admin Entry"); 141 m_log.Info("[IRC-Bridge]: XML RPC Admin Entry");
141 142
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index 687b2da..df3402d 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -635,7 +635,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
635 } 635 }
636 } 636 }
637 637
638 public XmlRpcResponse XmlRpcUpdateWelcomeMethod(XmlRpcRequest request) 638 public XmlRpcResponse XmlRpcUpdateWelcomeMethod(XmlRpcRequest request, IPEndPoint remoteClient)
639 { 639 {
640 m_log.Info("[Concierge]: processing UpdateWelcome request"); 640 m_log.Info("[Concierge]: processing UpdateWelcome request");
641 XmlRpcResponse response = new XmlRpcResponse(); 641 XmlRpcResponse response = new XmlRpcResponse();
diff --git a/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs
index 62d8f4b..8462103 100644
--- a/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.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 Nini.Config; 34using Nini.Config;
@@ -419,7 +420,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
419 /// <summary> 420 /// <summary>
420 /// XMLRPC handler to send alert message and sound to client 421 /// XMLRPC handler to send alert message and sound to client
421 /// </summary> 422 /// </summary>
422 public XmlRpcResponse UserAlert(XmlRpcRequest request) 423 public XmlRpcResponse UserAlert(XmlRpcRequest request, IPEndPoint remoteClient)
423 { 424 {
424 XmlRpcResponse ret = new XmlRpcResponse(); 425 XmlRpcResponse ret = new XmlRpcResponse();
425 Hashtable retparam = new Hashtable(); 426 Hashtable retparam = new Hashtable();
@@ -469,7 +470,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
469 470
470 # region Standalone box enablers only 471 # region Standalone box enablers only
471 472
472 public XmlRpcResponse quote_func(XmlRpcRequest request) 473 public XmlRpcResponse quote_func(XmlRpcRequest request, IPEndPoint remoteClient)
473 { 474 {
474 // Hashtable requestData = (Hashtable) request.Params[0]; 475 // Hashtable requestData = (Hashtable) request.Params[0];
475 // UUID agentId = UUID.Zero; 476 // UUID agentId = UUID.Zero;
@@ -493,7 +494,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
493 494
494 } 495 }
495 496
496 public XmlRpcResponse buy_func(XmlRpcRequest request) 497 public XmlRpcResponse buy_func(XmlRpcRequest request, IPEndPoint remoteClient)
497 { 498 {
498 // Hashtable requestData = (Hashtable) request.Params[0]; 499 // Hashtable requestData = (Hashtable) request.Params[0];
499 // UUID agentId = UUID.Zero; 500 // UUID agentId = UUID.Zero;
@@ -506,7 +507,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
506 return returnval; 507 return returnval;
507 } 508 }
508 509
509 public XmlRpcResponse preflightBuyLandPrep_func(XmlRpcRequest request) 510 public XmlRpcResponse preflightBuyLandPrep_func(XmlRpcRequest request, IPEndPoint remoteClient)
510 { 511 {
511 XmlRpcResponse ret = new XmlRpcResponse(); 512 XmlRpcResponse ret = new XmlRpcResponse();
512 Hashtable retparam = new Hashtable(); 513 Hashtable retparam = new Hashtable();
@@ -541,7 +542,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
541 return ret; 542 return ret;
542 } 543 }
543 544
544 public XmlRpcResponse landBuy_func(XmlRpcRequest request) 545 public XmlRpcResponse landBuy_func(XmlRpcRequest request, IPEndPoint remoteClient)
545 { 546 {
546 XmlRpcResponse ret = new XmlRpcResponse(); 547 XmlRpcResponse ret = new XmlRpcResponse();
547 Hashtable retparam = new Hashtable(); 548 Hashtable retparam = new Hashtable();