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/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 +-
 OpenSim/Framework/Servers/HttpServer/XmlRpcMethod.cs   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/Servers')

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);
 }
-- 
cgit v1.1