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

3 files changed, 7 insertions, 7 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
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        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
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        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
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        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
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        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
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        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
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        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
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        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"]);