From 31baeef469d72a9dc13cf4f56392b9f740f71cba Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Sat, 23 May 2009 06:05:20 +0000 Subject: * 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) --- OpenSim/Region/Communications/Hypergrid/HGGridServices.cs | 4 ++-- .../Communications/Hypergrid/HGGridServicesStandalone.cs | 6 +++--- OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 4 ++-- OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 5 +++-- .../Avatar/InstantMessage/MessageTransferModule.cs | 2 +- .../Region/CoreModules/Framework/Services/RegionMapService.cs | 3 ++- OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | 3 ++- OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs | 3 ++- .../OptionalModules/Avatar/Concierge/ConciergeModule.cs | 2 +- .../ReplaceableModules/MoneyModule/SampleMoneyModule.cs | 11 ++++++----- 10 files changed, 24 insertions(+), 19 deletions(-) (limited to 'OpenSim/Region') 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 /// /// /// - public XmlRpcResponse LinkRegionRequest(XmlRpcRequest request) + public XmlRpcResponse LinkRegionRequest(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; //string host = (string)requestData["host"]; @@ -710,7 +710,7 @@ namespace OpenSim.Region.Communications.Hypergrid /// /// /// - public XmlRpcResponse ExpectHGUser(XmlRpcRequest request) + public XmlRpcResponse ExpectHGUser(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; 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 /// /// /// - public virtual XmlRpcResponse PingCheckReply(XmlRpcRequest request) + public virtual XmlRpcResponse PingCheckReply(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); @@ -198,7 +198,7 @@ namespace OpenSim.Region.Communications.Hypergrid /// /// /// - public XmlRpcResponse LogOffUser(XmlRpcRequest request) + public XmlRpcResponse LogOffUser(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Debug("[HGrid]: LogOff User Called"); @@ -221,7 +221,7 @@ namespace OpenSim.Region.Communications.Hypergrid /// /// /// - public XmlRpcResponse LandData(XmlRpcRequest request) + public XmlRpcResponse LandData(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; 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 /// /// /// - public XmlRpcResponse PingCheckReply(XmlRpcRequest request) + public XmlRpcResponse PingCheckReply(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); @@ -838,7 +838,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// /// - public XmlRpcResponse LandData(XmlRpcRequest request) + public XmlRpcResponse LandData(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; 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 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Net; using System.Reflection; using log4net; using Nini.Config; @@ -250,7 +251,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends /// /// /// - public XmlRpcResponse processPresenceUpdateBulk(XmlRpcRequest req) + public XmlRpcResponse processPresenceUpdateBulk(XmlRpcRequest req, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)req.Params[0]; @@ -319,7 +320,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends return response; } - public XmlRpcResponse processTerminateFriend(XmlRpcRequest req) + public XmlRpcResponse processTerminateFriend(XmlRpcRequest req, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)req.Params[0]; 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 /// XMLRPC parameters /// /// Nothing much - protected virtual XmlRpcResponse processXMLRPCGridInstantMessage(XmlRpcRequest request) + protected virtual XmlRpcResponse processXMLRPCGridInstantMessage(XmlRpcRequest request, IPEndPoint remoteClient) { bool successful = false; 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 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Net; using System.Reflection; using log4net; using Nini.Config; @@ -135,7 +136,7 @@ namespace OpenSim.Region.CoreModules.Framework.Services /// /// /// - public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; 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 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Net; using System.Reflection; using System.Threading; using log4net; @@ -404,7 +405,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC #endregion - public XmlRpcResponse XmlRpcRemoteData(XmlRpcRequest request) + public XmlRpcResponse XmlRpcRemoteData(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); 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 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Net; using System.Reflection; using log4net; using Nini.Config; @@ -135,7 +136,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat } #endregion - public static XmlRpcResponse XmlRpcAdminMethod(XmlRpcRequest request) + public static XmlRpcResponse XmlRpcAdminMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[IRC-Bridge]: XML RPC Admin Entry"); 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 } } - public XmlRpcResponse XmlRpcUpdateWelcomeMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcUpdateWelcomeMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[Concierge]: processing UpdateWelcome request"); 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 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Net; using System.Reflection; using log4net; using Nini.Config; @@ -419,7 +420,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule /// /// XMLRPC handler to send alert message and sound to client /// - public XmlRpcResponse UserAlert(XmlRpcRequest request) + public XmlRpcResponse UserAlert(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse ret = new XmlRpcResponse(); Hashtable retparam = new Hashtable(); @@ -469,7 +470,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule # region Standalone box enablers only - public XmlRpcResponse quote_func(XmlRpcRequest request) + public XmlRpcResponse quote_func(XmlRpcRequest request, IPEndPoint remoteClient) { // Hashtable requestData = (Hashtable) request.Params[0]; // UUID agentId = UUID.Zero; @@ -493,7 +494,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule } - public XmlRpcResponse buy_func(XmlRpcRequest request) + public XmlRpcResponse buy_func(XmlRpcRequest request, IPEndPoint remoteClient) { // Hashtable requestData = (Hashtable) request.Params[0]; // UUID agentId = UUID.Zero; @@ -506,7 +507,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule return returnval; } - public XmlRpcResponse preflightBuyLandPrep_func(XmlRpcRequest request) + public XmlRpcResponse preflightBuyLandPrep_func(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse ret = new XmlRpcResponse(); Hashtable retparam = new Hashtable(); @@ -541,7 +542,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule return ret; } - public XmlRpcResponse landBuy_func(XmlRpcRequest request) + public XmlRpcResponse landBuy_func(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse ret = new XmlRpcResponse(); Hashtable retparam = new Hashtable(); -- cgit v1.1