diff options
author | Adam Frisby | 2009-05-23 06:05:20 +0000 |
---|---|---|
committer | Adam Frisby | 2009-05-23 06:05:20 +0000 |
commit | 31baeef469d72a9dc13cf4f56392b9f740f71cba (patch) | |
tree | ac50806ced72c5b296645bf061a3d9176a41075c /OpenSim/Region/CoreModules | |
parent | * Breaks OpenSim.. err I mean.. adds NAT translation support to EnableSimulat... (diff) | |
download | opensim-SC_OLD-31baeef469d72a9dc13cf4f56392b9f740f71cba.zip opensim-SC_OLD-31baeef469d72a9dc13cf4f56392b9f740f71cba.tar.gz opensim-SC_OLD-31baeef469d72a9dc13cf4f56392b9f740f71cba.tar.bz2 opensim-SC_OLD-31baeef469d72a9dc13cf4f56392b9f740f71cba.tar.xz |
* 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)
Diffstat (limited to '')
4 files changed, 8 insertions, 5 deletions
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 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Net; | ||
31 | using System.Reflection; | 32 | using System.Reflection; |
32 | using log4net; | 33 | using log4net; |
33 | using Nini.Config; | 34 | using Nini.Config; |
@@ -250,7 +251,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
250 | /// </summary> | 251 | /// </summary> |
251 | /// <param name="req"></param> | 252 | /// <param name="req"></param> |
252 | /// <returns></returns> | 253 | /// <returns></returns> |
253 | public XmlRpcResponse processPresenceUpdateBulk(XmlRpcRequest req) | 254 | public XmlRpcResponse processPresenceUpdateBulk(XmlRpcRequest req, IPEndPoint remoteClient) |
254 | { | 255 | { |
255 | Hashtable requestData = (Hashtable)req.Params[0]; | 256 | Hashtable requestData = (Hashtable)req.Params[0]; |
256 | 257 | ||
@@ -319,7 +320,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
319 | return response; | 320 | return response; |
320 | } | 321 | } |
321 | 322 | ||
322 | public XmlRpcResponse processTerminateFriend(XmlRpcRequest req) | 323 | public XmlRpcResponse processTerminateFriend(XmlRpcRequest req, IPEndPoint remoteClient) |
323 | { | 324 | { |
324 | Hashtable requestData = (Hashtable)req.Params[0]; | 325 | Hashtable requestData = (Hashtable)req.Params[0]; |
325 | 326 | ||
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 | |||
180 | /// <param name="request">XMLRPC parameters | 180 | /// <param name="request">XMLRPC parameters |
181 | /// </param> | 181 | /// </param> |
182 | /// <returns>Nothing much</returns> | 182 | /// <returns>Nothing much</returns> |
183 | protected virtual XmlRpcResponse processXMLRPCGridInstantMessage(XmlRpcRequest request) | 183 | protected virtual XmlRpcResponse processXMLRPCGridInstantMessage(XmlRpcRequest request, IPEndPoint remoteClient) |
184 | { | 184 | { |
185 | bool successful = false; | 185 | bool successful = false; |
186 | 186 | ||
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 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Net; | ||
31 | using System.Reflection; | 32 | using System.Reflection; |
32 | using log4net; | 33 | using log4net; |
33 | using Nini.Config; | 34 | using Nini.Config; |
@@ -135,7 +136,7 @@ namespace OpenSim.Region.CoreModules.Framework.Services | |||
135 | /// </summary> | 136 | /// </summary> |
136 | /// <param name="request"></param> | 137 | /// <param name="request"></param> |
137 | /// <returns></returns> | 138 | /// <returns></returns> |
138 | public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request) | 139 | public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
139 | { | 140 | { |
140 | Hashtable requestData = (Hashtable)request.Params[0]; | 141 | Hashtable requestData = (Hashtable)request.Params[0]; |
141 | Hashtable responseData = new Hashtable(); | 142 | 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 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Net; | ||
31 | using System.Reflection; | 32 | using System.Reflection; |
32 | using System.Threading; | 33 | using System.Threading; |
33 | using log4net; | 34 | using log4net; |
@@ -404,7 +405,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC | |||
404 | 405 | ||
405 | #endregion | 406 | #endregion |
406 | 407 | ||
407 | public XmlRpcResponse XmlRpcRemoteData(XmlRpcRequest request) | 408 | public XmlRpcResponse XmlRpcRemoteData(XmlRpcRequest request, IPEndPoint remoteClient) |
408 | { | 409 | { |
409 | XmlRpcResponse response = new XmlRpcResponse(); | 410 | XmlRpcResponse response = new XmlRpcResponse(); |
410 | 411 | ||