* 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)

2 files changed, 8 insertions, 8 deletions

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
         /// </summary>
         /// <param name="request">UserServer Data</param>
         /// <returns></returns>
-        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
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        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();