diff options
author | Adam Frisby | 2009-05-23 06:14:02 +0000 |
---|---|---|
committer | Adam Frisby | 2009-05-23 06:14:02 +0000 |
commit | e9ea9592631beb164bfca0765b14ffbfbbaa4fb7 (patch) | |
tree | 0b57b5a5aa8b2793994fc7ebbab71e4f7034e4df /OpenSim/Framework/Servers | |
parent | * Pipes requestors IP address through all XmlRpcRequest delegates. This is ne... (diff) | |
download | opensim-SC_OLD-e9ea9592631beb164bfca0765b14ffbfbbaa4fb7.zip opensim-SC_OLD-e9ea9592631beb164bfca0765b14ffbfbbaa4fb7.tar.gz opensim-SC_OLD-e9ea9592631beb164bfca0765b14ffbfbbaa4fb7.tar.bz2 opensim-SC_OLD-e9ea9592631beb164bfca0765b14ffbfbbaa4fb7.tar.xz |
* Pipes IPEndPoint through all Login methods, including LLSD/OSD login paths.
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 8fb2082..e18fd55 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -755,7 +755,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
755 | if (m_defaultLlsdHandler != null) | 755 | if (m_defaultLlsdHandler != null) |
756 | { | 756 | { |
757 | // LibOMV path | 757 | // LibOMV path |
758 | llsdResponse = m_defaultLlsdHandler(llsdRequest); | 758 | llsdResponse = m_defaultLlsdHandler(llsdRequest, request.RemoteIPEndPoint); |
759 | } | 759 | } |
760 | else | 760 | else |
761 | { | 761 | { |
diff --git a/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs b/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs index d669182..aa03414 100644 --- a/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs +++ b/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs | |||
@@ -25,10 +25,11 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Net; | ||
28 | using OpenMetaverse.StructuredData; | 29 | using OpenMetaverse.StructuredData; |
29 | 30 | ||
30 | namespace OpenSim.Framework.Servers.HttpServer | 31 | namespace OpenSim.Framework.Servers.HttpServer |
31 | { | 32 | { |
32 | public delegate OSD LLSDMethod( string path, OSD request, string endpoint ); | 33 | public delegate OSD LLSDMethod( string path, OSD request, string endpoint ); |
33 | public delegate OSD DefaultLLSDMethod(OSD request); | 34 | public delegate OSD DefaultLLSDMethod(OSD request, IPEndPoint client); |
34 | } | 35 | } |