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) --- .../RemoteController/RemoteAdminPlugin.cs | 40 +++++++++++----------- OpenSim/Client/Linden/LLProxyLoginModule.cs | 4 +-- .../Communications/Services/GridInfoService.cs | 3 +- .../Communications/Services/HGLoginAuthService.cs | 8 ++--- .../Communications/Services/LoginService.cs | 5 +-- .../Communications/Tests/LoginServiceTests.cs | 18 +++++----- .../Framework/Servers/HttpServer/BaseHttpServer.cs | 2 +- .../Framework/Servers/HttpServer/XmlRpcMethod.cs | 3 +- .../Grid/GridServer.Modules/GridMessagingModule.cs | 5 +-- .../Grid/GridServer.Modules/GridXmlRpcModule.cs | 11 +++--- .../MessagingServer.Modules/MessageRegionModule.cs | 4 +-- .../Grid/MessagingServer.Modules/MessageService.cs | 12 +++---- .../UserServer.Modules/MessageServersConnector.cs | 14 ++++---- .../Grid/UserServer.Modules/UserLoginService.cs | 3 +- OpenSim/Grid/UserServer.Modules/UserManager.cs | 15 ++++---- .../UserServerAvatarAppearanceModule.cs | 5 +-- .../UserServer.Modules/UserServerFriendsModule.cs | 9 ++--- .../Communications/Hypergrid/HGGridServices.cs | 4 +-- .../Hypergrid/HGGridServicesStandalone.cs | 6 ++-- .../Region/Communications/OGS1/OGS1GridServices.cs | 4 +-- .../CoreModules/Avatar/Friends/FriendsModule.cs | 5 +-- .../Avatar/InstantMessage/MessageTransferModule.cs | 2 +- .../Framework/Services/RegionMapService.cs | 3 +- .../CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | 3 +- .../OptionalModules/Avatar/Chat/IRCBridgeModule.cs | 3 +- .../Avatar/Concierge/ConciergeModule.cs | 2 +- .../MoneyModule/SampleMoneyModule.cs | 11 +++--- 27 files changed, 109 insertions(+), 95 deletions(-) diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 3a4a68f..f29cca4 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -171,7 +171,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController } } - public XmlRpcResponse XmlRpcRestartMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcRestartMethod(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable responseData = new Hashtable(); @@ -219,7 +219,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController return response; } - public XmlRpcResponse XmlRpcAlertMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcAlertMethod(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable responseData = new Hashtable(); @@ -266,7 +266,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController return response; } - public XmlRpcResponse XmlRpcLoadHeightmapMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcLoadHeightmapMethod(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable responseData = new Hashtable(); @@ -323,7 +323,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController return response; } - public XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: Received Shutdown Administrator Request"); @@ -450,7 +450,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController /// name of the newly created region /// /// - public XmlRpcResponse XmlRpcCreateRegionMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcCreateRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: CreateRegion: new request"); XmlRpcResponse response = new XmlRpcResponse(); @@ -686,7 +686,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController /// error message if success is false /// /// - public XmlRpcResponse XmlRpcDeleteRegionMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcDeleteRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: DeleteRegion: new request"); XmlRpcResponse response = new XmlRpcResponse(); @@ -760,7 +760,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController /// /// - public XmlRpcResponse XmlRpcModifyRegionMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcModifyRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: ModifyRegion: new request"); XmlRpcResponse response = new XmlRpcResponse(); @@ -861,7 +861,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController /// /// /// - public XmlRpcResponse XmlRpcCreateUserMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcCreateUserMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: CreateUser: new request"); XmlRpcResponse response = new XmlRpcResponse(); @@ -967,7 +967,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController /// error message if success is false /// /// - public XmlRpcResponse XmlRpcUserExistsMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcUserExistsMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: UserExists: new request"); XmlRpcResponse response = new XmlRpcResponse(); @@ -1050,7 +1050,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController /// /// - public XmlRpcResponse XmlRpcUpdateUserAccountMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcUpdateUserAccountMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: UpdateUserAccount: new request"); XmlRpcResponse response = new XmlRpcResponse(); @@ -1706,7 +1706,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController /// error message if success is false /// /// - public XmlRpcResponse XmlRpcLoadOARMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcLoadOARMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: Received Load OAR Administrator Request"); XmlRpcResponse response = new XmlRpcResponse(); @@ -1805,7 +1805,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController /// error message if success is false /// /// - public XmlRpcResponse XmlRpcSaveOARMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcSaveOARMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: Received Save OAR Administrator Request"); XmlRpcResponse response = new XmlRpcResponse(); @@ -1884,7 +1884,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController lock (SOLock) Monitor.Pulse(SOLock); } - public XmlRpcResponse XmlRpcLoadXMLMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcLoadXMLMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: Received Load XML Administrator Request"); XmlRpcResponse response = new XmlRpcResponse(); @@ -1969,7 +1969,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController } - public XmlRpcResponse XmlRpcSaveXMLMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcSaveXMLMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: Received Save XML Administrator Request"); XmlRpcResponse response = new XmlRpcResponse(); @@ -2051,7 +2051,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController return response; } - public XmlRpcResponse XmlRpcRegionQueryMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcRegionQueryMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: Received Query XML Administrator Request"); XmlRpcResponse response = new XmlRpcResponse(); @@ -2107,7 +2107,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController return response; } - public XmlRpcResponse XmlRpcConsoleCommandMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcConsoleCommandMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: Received Command XML Administrator Request"); XmlRpcResponse response = new XmlRpcResponse(); @@ -2145,7 +2145,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController return response; } - public XmlRpcResponse XmlRpcAccessListClear(XmlRpcRequest request) + public XmlRpcResponse XmlRpcAccessListClear(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: Received Access List Clear Request"); @@ -2200,7 +2200,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController return response; } - public XmlRpcResponse XmlRpcAccessListAdd(XmlRpcRequest request) + public XmlRpcResponse XmlRpcAccessListAdd(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: Received Access List Add Request"); @@ -2284,7 +2284,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController return response; } - public XmlRpcResponse XmlRpcAccessListRemove(XmlRpcRequest request) + public XmlRpcResponse XmlRpcAccessListRemove(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: Received Access List Remove Request"); @@ -2367,7 +2367,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController return response; } - public XmlRpcResponse XmlRpcAccessListList(XmlRpcRequest request) + public XmlRpcResponse XmlRpcAccessListList(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[RADMIN]: Received Access List List Request"); diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs index b7b9adb..88b7972 100644 --- a/OpenSim/Client/Linden/LLProxyLoginModule.cs +++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs @@ -175,7 +175,7 @@ namespace OpenSim.Client.Linden /// /// /// - public XmlRpcResponse ExpectUser(XmlRpcRequest request) + public XmlRpcResponse ExpectUser(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; AgentCircuitData agentData = new AgentCircuitData(); @@ -285,7 +285,7 @@ namespace OpenSim.Client.Linden /// /// /// - public XmlRpcResponse LogOffUser(XmlRpcRequest request) + public XmlRpcResponse LogOffUser(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Debug("[CONNECTION DEBUGGING]: LogOff User Called"); diff --git a/OpenSim/Framework/Communications/Services/GridInfoService.cs b/OpenSim/Framework/Communications/Services/GridInfoService.cs index f17bb9f..317dba2 100644 --- a/OpenSim/Framework/Communications/Services/GridInfoService.cs +++ b/OpenSim/Framework/Communications/Services/GridInfoService.cs @@ -28,6 +28,7 @@ using System; using System.Collections; using System.IO; +using System.Net; using System.Reflection; using System.Text; using log4net; @@ -138,7 +139,7 @@ namespace OpenSim.Framework.Communications.Services } } - public XmlRpcResponse XmlRpcGridInfoMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcGridInfoMethod(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable responseData = new Hashtable(); diff --git a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs index b62e4a2..3756cf5 100644 --- a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs +++ b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs @@ -86,10 +86,10 @@ namespace OpenSim.Framework.Communications.Services m_serversInfo = sinfo; } - public override XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) + public override XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[HGLOGIN]: HGLogin called " + request.MethodName); - XmlRpcResponse response = base.XmlRpcLoginMethod(request); + XmlRpcResponse response = base.XmlRpcLoginMethod(request, remoteClient); Hashtable responseData = (Hashtable)response.Value; responseData["grid_service"] = m_serversInfo.GridURL; @@ -132,7 +132,7 @@ namespace OpenSim.Framework.Communications.Services return response; } - public XmlRpcResponse XmlRpcGenerateKeyMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcGenerateKeyMethod(XmlRpcRequest request, IPEndPoint remoteClient) { // Verify the key of who's calling UUID userID = UUID.Zero; @@ -157,7 +157,7 @@ namespace OpenSim.Framework.Communications.Services return response; } - public XmlRpcResponse XmlRpcVerifyKeyMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcVerifyKeyMethod(XmlRpcRequest request, IPEndPoint remoteClient) { bool success = false; diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs index f55c030..6859827 100644 --- a/OpenSim/Framework/Communications/Services/LoginService.cs +++ b/OpenSim/Framework/Communications/Services/LoginService.cs @@ -29,6 +29,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.IO; +using System.Net; using System.Reflection; using System.Text.RegularExpressions; using System.Threading; @@ -97,7 +98,7 @@ namespace OpenSim.Framework.Communications.Services /// /// The XMLRPC request /// The response to send - public virtual XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) + public virtual XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request, IPEndPoint remoteClient) { // Temporary fix m_loginMutex.WaitOne(); @@ -1125,7 +1126,7 @@ namespace OpenSim.Framework.Communications.Services return false; } - public XmlRpcResponse XmlRPCCheckAuthSession(XmlRpcRequest request) + public XmlRpcResponse XmlRPCCheckAuthSession(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs index 7d75faa..a2a388e 100644 --- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs @@ -103,7 +103,7 @@ namespace OpenSim.Framework.Communications.Tests XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); - XmlRpcResponse response = loginService.XmlRpcLoginMethod(request); + XmlRpcResponse response = loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); Hashtable responseData = (Hashtable)response.Value; Assert.That(responseData["first_name"], Is.EqualTo(m_firstName)); @@ -140,7 +140,7 @@ namespace OpenSim.Framework.Communications.Tests XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); - XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request); + XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); Hashtable responseData = (Hashtable)response.Value; UserAgentData uagent = m_userProfileData.CurrentAgent; @@ -194,7 +194,7 @@ namespace OpenSim.Framework.Communications.Tests XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); - XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request); + XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); Hashtable responseData = (Hashtable)response.Value; ArrayList friendslist = (ArrayList) responseData["buddy-list"]; @@ -231,7 +231,7 @@ namespace OpenSim.Framework.Communications.Tests XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); - XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request); + XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); Hashtable responseData = (Hashtable)response.Value; Assert.That(responseData["message"], Is.EqualTo(error_auth_message)); @@ -256,7 +256,7 @@ namespace OpenSim.Framework.Communications.Tests XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); - XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request); + XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); Hashtable responseData = (Hashtable)response.Value; Assert.That(responseData["message"], Is.EqualTo(error_auth_message)); @@ -281,7 +281,7 @@ namespace OpenSim.Framework.Communications.Tests XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); - XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request); + XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); Hashtable responseData = (Hashtable)response.Value; Assert.That(responseData["message"], Is.EqualTo(error_xml_message)); @@ -312,20 +312,20 @@ namespace OpenSim.Framework.Communications.Tests // First we log in. XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); - XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request); + XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); Hashtable responseData = (Hashtable)response.Value; Assert.That(responseData["message"], Is.EqualTo("Hello folks")); // Then we try again, this time expecting failure. request = new XmlRpcRequest("login_to_simulator", sendParams); - response = m_loginService.XmlRpcLoginMethod(request); + response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); responseData = (Hashtable)response.Value; Assert.That(responseData["message"], Is.EqualTo(error_already_logged)); // Finally the third time we should be able to get right back in. request = new XmlRpcRequest("login_to_simulator", sendParams); - response = m_loginService.XmlRpcLoginMethod(request); + response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); responseData = (Hashtable)response.Value; Assert.That(responseData["message"], Is.EqualTo("Hello folks")); diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 5778214..8fb2082 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs @@ -612,7 +612,7 @@ namespace OpenSim.Framework.Servers.HttpServer try { - xmlRpcResponse = method(xmlRprcRequest); + xmlRpcResponse = method(xmlRprcRequest, request.RemoteIPEndPoint); } catch(Exception e) { diff --git a/OpenSim/Framework/Servers/HttpServer/XmlRpcMethod.cs b/OpenSim/Framework/Servers/HttpServer/XmlRpcMethod.cs index 843b3f7..62ebe62 100644 --- a/OpenSim/Framework/Servers/HttpServer/XmlRpcMethod.cs +++ b/OpenSim/Framework/Servers/HttpServer/XmlRpcMethod.cs @@ -25,9 +25,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System.Net; using Nwc.XmlRpc; namespace OpenSim.Framework.Servers.HttpServer { - public delegate XmlRpcResponse XmlRpcMethod(XmlRpcRequest request); + public delegate XmlRpcResponse XmlRpcMethod(XmlRpcRequest request, IPEndPoint client); } diff --git a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs index 2f08756..eaf5b86 100644 --- a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs +++ b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs @@ -28,6 +28,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Net; using System.Reflection; using System.Text; using Nwc.XmlRpc; @@ -98,7 +99,7 @@ namespace OpenSim.Grid.GridServer.Modules } } - public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request) + public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; @@ -120,7 +121,7 @@ namespace OpenSim.Grid.GridServer.Modules return response; } - public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request) + public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; diff --git a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs index 14a328f..59fadce 100644 --- a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs +++ b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs @@ -29,6 +29,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.IO; +using System.Net; using System.Reflection; using System.Xml; using log4net; @@ -246,7 +247,7 @@ namespace OpenSim.Grid.GridServer.Modules /// /// The XML RPC Request /// Startup parameters - public XmlRpcResponse XmlRpcSimulatorLoginMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcSimulatorLoginMethod(XmlRpcRequest request, IPEndPoint remoteClient) { RegionProfileData sim; RegionProfileData existingSim; @@ -575,7 +576,7 @@ namespace OpenSim.Grid.GridServer.Modules /// /// The XMLRPC Request /// Processing parameters - public XmlRpcResponse XmlRpcDeleteRegionMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcDeleteRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable responseData = new Hashtable(); @@ -631,7 +632,7 @@ namespace OpenSim.Grid.GridServer.Modules /// /// /// - public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; Hashtable responseData = new Hashtable(); @@ -696,7 +697,7 @@ namespace OpenSim.Grid.GridServer.Modules return response; } - public XmlRpcResponse XmlRpcMapBlockMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcMapBlockMethod(XmlRpcRequest request, IPEndPoint remoteClient) { int xmin = 980, ymin = 980, xmax = 1020, ymax = 1020; @@ -806,7 +807,7 @@ namespace OpenSim.Grid.GridServer.Modules /// /// /// - public XmlRpcResponse XmlRpcSearchForRegionMethod(XmlRpcRequest request) + public XmlRpcResponse XmlRpcSearchForRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs index f7ef759..f158591 100644 --- a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs +++ b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs @@ -181,7 +181,7 @@ namespace OpenSim.Grid.MessagingServer.Modules return regionProfile; } - public XmlRpcResponse RegionStartup(XmlRpcRequest request) + public XmlRpcResponse RegionStartup(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; Hashtable result = new Hashtable(); @@ -195,7 +195,7 @@ namespace OpenSim.Grid.MessagingServer.Modules return response; } - public XmlRpcResponse RegionShutdown(XmlRpcRequest request) + public XmlRpcResponse RegionShutdown(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; Hashtable result = new Hashtable(); diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs index bff17df..99fe264 100644 --- a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs +++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs @@ -322,7 +322,7 @@ namespace OpenSim.Grid.MessagingServer.Modules /// /// UserServer Data /// - public XmlRpcResponse UserLoggedOn(XmlRpcRequest request) + public XmlRpcResponse UserLoggedOn(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; @@ -370,7 +370,7 @@ namespace OpenSim.Grid.MessagingServer.Modules /// /// /// - public XmlRpcResponse UserLoggedOff(XmlRpcRequest request) + public XmlRpcResponse UserLoggedOff(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Info("[USERLOGOFF]: User logged off called"); Hashtable requestData = (Hashtable)request.Params[0]; @@ -383,7 +383,7 @@ namespace OpenSim.Grid.MessagingServer.Modules #endregion - public XmlRpcResponse GetPresenceInfoBulk(XmlRpcRequest request) + public XmlRpcResponse GetPresenceInfoBulk(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable paramHash = (Hashtable)request.Params[0]; Hashtable result = new Hashtable(); @@ -426,7 +426,7 @@ namespace OpenSim.Grid.MessagingServer.Modules } } - public XmlRpcResponse AgentLocation(XmlRpcRequest request) + public XmlRpcResponse AgentLocation(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; Hashtable result = new Hashtable(); @@ -441,7 +441,7 @@ namespace OpenSim.Grid.MessagingServer.Modules return response; } - public XmlRpcResponse AgentLeaving(XmlRpcRequest request) + public XmlRpcResponse AgentLeaving(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; Hashtable result = new Hashtable(); @@ -455,7 +455,7 @@ namespace OpenSim.Grid.MessagingServer.Modules return response; } - public XmlRpcResponse ProcessRegionShutdown(XmlRpcRequest request) + public XmlRpcResponse ProcessRegionShutdown(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; Hashtable result = new Hashtable(); 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 } } - public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request) + public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; @@ -187,7 +187,7 @@ namespace OpenSim.Grid.UserServer.Modules } return response; } - public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request) + public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; @@ -203,7 +203,7 @@ namespace OpenSim.Grid.UserServer.Modules } return response; } - public XmlRpcResponse XmlRPCUserMovedtoRegion(XmlRpcRequest request) + public XmlRpcResponse XmlRPCUserMovedtoRegion(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; @@ -430,7 +430,7 @@ namespace OpenSim.Grid.UserServer.Modules } } - public XmlRpcResponse RegionStartup(XmlRpcRequest request) + public XmlRpcResponse RegionStartup(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; Hashtable result = new Hashtable(); @@ -449,7 +449,7 @@ namespace OpenSim.Grid.UserServer.Modules return response; } - public XmlRpcResponse RegionShutdown(XmlRpcRequest request) + public XmlRpcResponse RegionShutdown(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; Hashtable result = new Hashtable(); @@ -468,7 +468,7 @@ namespace OpenSim.Grid.UserServer.Modules return response; } - public XmlRpcResponse AgentLocation(XmlRpcRequest request) + public XmlRpcResponse AgentLocation(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; Hashtable result = new Hashtable(); @@ -489,7 +489,7 @@ namespace OpenSim.Grid.UserServer.Modules return response; } - public XmlRpcResponse AgentLeaving(XmlRpcRequest request) + public XmlRpcResponse AgentLeaving(XmlRpcRequest request, IPEndPoint remoteClient) { Hashtable requestData = (Hashtable)request.Params[0]; 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 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Net; using System.Reflection; using System.Text.RegularExpressions; using log4net; @@ -368,7 +369,7 @@ namespace OpenSim.Grid.UserServer.Modules return true; } - public XmlRpcResponse XmlRPCSetLoginParams(XmlRpcRequest request) + public XmlRpcResponse XmlRPCSetLoginParams(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); 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 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Net; using System.Reflection; using log4net; using Nwc.XmlRpc; @@ -201,7 +202,7 @@ namespace OpenSim.Grid.UserServer.Modules #region XMLRPC User Methods - public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request) + public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request, IPEndPoint remoteClient) { // XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; @@ -218,7 +219,7 @@ namespace OpenSim.Grid.UserServer.Modules return AvatarPickerListtoXmlRPCResponse(queryID, returnAvatar); } - public XmlRpcResponse XmlRPCAtRegion(XmlRpcRequest request) + public XmlRpcResponse XmlRPCAtRegion(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; @@ -253,7 +254,7 @@ namespace OpenSim.Grid.UserServer.Modules return response; } - public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request) + public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request, IPEndPoint remoteClient) { // XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; @@ -290,7 +291,7 @@ namespace OpenSim.Grid.UserServer.Modules return ProfileToXmlRPCResponse(userProfile); } - public XmlRpcResponse XmlRPCGetUserMethodUUID(XmlRpcRequest request) + public XmlRpcResponse XmlRPCGetUserMethodUUID(XmlRpcRequest request, IPEndPoint remoteClient) { // XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; @@ -323,7 +324,7 @@ namespace OpenSim.Grid.UserServer.Modules return ProfileToXmlRPCResponse(userProfile); } - public XmlRpcResponse XmlRPCGetAgentMethodUUID(XmlRpcRequest request) + public XmlRpcResponse XmlRPCGetAgentMethodUUID(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; @@ -372,7 +373,7 @@ namespace OpenSim.Grid.UserServer.Modules return response; } - public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserProfile(XmlRpcRequest request) + public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserProfile(XmlRpcRequest request, IPEndPoint remoteClient) { m_log.Debug("[UserManager]: Got request to update user profile"); XmlRpcResponse response = new XmlRpcResponse(); @@ -565,7 +566,7 @@ namespace OpenSim.Grid.UserServer.Modules return response; } - public XmlRpcResponse XmlRPCLogOffUserMethodUUID(XmlRpcRequest request) + public XmlRpcResponse XmlRPCLogOffUserMethodUUID(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); 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 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Net; using System.Reflection; using log4net; using Nwc.XmlRpc; @@ -70,7 +71,7 @@ namespace OpenSim.Grid.UserServer.Modules m_httpServer.AddXmlRPCHandler("update_avatar_appearance", XmlRPCUpdateAvatarAppearance); } - public XmlRpcResponse XmlRPCGetAvatarAppearance(XmlRpcRequest request) + public XmlRpcResponse XmlRPCGetAvatarAppearance(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; @@ -101,7 +102,7 @@ namespace OpenSim.Grid.UserServer.Modules return response; } - public XmlRpcResponse XmlRPCUpdateAvatarAppearance(XmlRpcRequest request) + public XmlRpcResponse XmlRPCUpdateAvatarAppearance(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); 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 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Net; using System.Reflection; using log4net; using Nwc.XmlRpc; @@ -93,7 +94,7 @@ namespace OpenSim.Grid.UserServer.Modules return response; } - public XmlRpcResponse XmlRpcResponseXmlRPCAddUserFriend(XmlRpcRequest request) + public XmlRpcResponse XmlRpcResponseXmlRPCAddUserFriend(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; @@ -115,7 +116,7 @@ namespace OpenSim.Grid.UserServer.Modules return response; } - public XmlRpcResponse XmlRpcResponseXmlRPCRemoveUserFriend(XmlRpcRequest request) + public XmlRpcResponse XmlRpcResponseXmlRPCRemoveUserFriend(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; @@ -135,7 +136,7 @@ namespace OpenSim.Grid.UserServer.Modules return response; } - public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserFriendPerms(XmlRpcRequest request) + public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserFriendPerms(XmlRpcRequest request, IPEndPoint remoteClient) { XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; @@ -156,7 +157,7 @@ namespace OpenSim.Grid.UserServer.Modules return response; } - public XmlRpcResponse XmlRpcResponseXmlRPCGetUserFriendList(XmlRpcRequest request) + public XmlRpcResponse XmlRpcResponseXmlRPCGetUserFriendList(XmlRpcRequest request, IPEndPoint remoteClient) { // XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable)request.Params[0]; 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