aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer.Modules
diff options
context:
space:
mode:
authorAdam Frisby2009-05-23 06:05:20 +0000
committerAdam Frisby2009-05-23 06:05:20 +0000
commit31baeef469d72a9dc13cf4f56392b9f740f71cba (patch)
treeac50806ced72c5b296645bf061a3d9176a41075c /OpenSim/Grid/GridServer.Modules
parent* Breaks OpenSim.. err I mean.. adds NAT translation support to EnableSimulat... (diff)
downloadopensim-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 'OpenSim/Grid/GridServer.Modules')
-rw-r--r--OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs5
-rw-r--r--OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs11
2 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs
index 2f08756..eaf5b86 100644
--- a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net;
31using System.Reflection; 32using System.Reflection;
32using System.Text; 33using System.Text;
33using Nwc.XmlRpc; 34using Nwc.XmlRpc;
@@ -98,7 +99,7 @@ namespace OpenSim.Grid.GridServer.Modules
98 } 99 }
99 } 100 }
100 101
101 public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request) 102 public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request, IPEndPoint remoteClient)
102 { 103 {
103 XmlRpcResponse response = new XmlRpcResponse(); 104 XmlRpcResponse response = new XmlRpcResponse();
104 Hashtable requestData = (Hashtable)request.Params[0]; 105 Hashtable requestData = (Hashtable)request.Params[0];
@@ -120,7 +121,7 @@ namespace OpenSim.Grid.GridServer.Modules
120 return response; 121 return response;
121 } 122 }
122 123
123 public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request) 124 public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request, IPEndPoint remoteClient)
124 { 125 {
125 XmlRpcResponse response = new XmlRpcResponse(); 126 XmlRpcResponse response = new XmlRpcResponse();
126 Hashtable requestData = (Hashtable)request.Params[0]; 127 Hashtable requestData = (Hashtable)request.Params[0];
diff --git a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
index 14a328f..59fadce 100644
--- a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
@@ -29,6 +29,7 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Net;
32using System.Reflection; 33using System.Reflection;
33using System.Xml; 34using System.Xml;
34using log4net; 35using log4net;
@@ -246,7 +247,7 @@ namespace OpenSim.Grid.GridServer.Modules
246 /// </summary> 247 /// </summary>
247 /// <param name="request">The XML RPC Request</param> 248 /// <param name="request">The XML RPC Request</param>
248 /// <returns>Startup parameters</returns> 249 /// <returns>Startup parameters</returns>
249 public XmlRpcResponse XmlRpcSimulatorLoginMethod(XmlRpcRequest request) 250 public XmlRpcResponse XmlRpcSimulatorLoginMethod(XmlRpcRequest request, IPEndPoint remoteClient)
250 { 251 {
251 RegionProfileData sim; 252 RegionProfileData sim;
252 RegionProfileData existingSim; 253 RegionProfileData existingSim;
@@ -575,7 +576,7 @@ namespace OpenSim.Grid.GridServer.Modules
575 /// <returns></returns> 576 /// <returns></returns>
576 /// <param name="request">The XMLRPC Request</param> 577 /// <param name="request">The XMLRPC Request</param>
577 /// <returns>Processing parameters</returns> 578 /// <returns>Processing parameters</returns>
578 public XmlRpcResponse XmlRpcDeleteRegionMethod(XmlRpcRequest request) 579 public XmlRpcResponse XmlRpcDeleteRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient)
579 { 580 {
580 XmlRpcResponse response = new XmlRpcResponse(); 581 XmlRpcResponse response = new XmlRpcResponse();
581 Hashtable responseData = new Hashtable(); 582 Hashtable responseData = new Hashtable();
@@ -631,7 +632,7 @@ namespace OpenSim.Grid.GridServer.Modules
631 /// </summary> 632 /// </summary>
632 /// <param name="request"></param> 633 /// <param name="request"></param>
633 /// <returns></returns> 634 /// <returns></returns>
634 public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request) 635 public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request, IPEndPoint remoteClient)
635 { 636 {
636 Hashtable requestData = (Hashtable)request.Params[0]; 637 Hashtable requestData = (Hashtable)request.Params[0];
637 Hashtable responseData = new Hashtable(); 638 Hashtable responseData = new Hashtable();
@@ -696,7 +697,7 @@ namespace OpenSim.Grid.GridServer.Modules
696 return response; 697 return response;
697 } 698 }
698 699
699 public XmlRpcResponse XmlRpcMapBlockMethod(XmlRpcRequest request) 700 public XmlRpcResponse XmlRpcMapBlockMethod(XmlRpcRequest request, IPEndPoint remoteClient)
700 { 701 {
701 int xmin = 980, ymin = 980, xmax = 1020, ymax = 1020; 702 int xmin = 980, ymin = 980, xmax = 1020, ymax = 1020;
702 703
@@ -806,7 +807,7 @@ namespace OpenSim.Grid.GridServer.Modules
806 /// </summary> 807 /// </summary>
807 /// <param name="request"></param> 808 /// <param name="request"></param>
808 /// <returns></returns> 809 /// <returns></returns>
809 public XmlRpcResponse XmlRpcSearchForRegionMethod(XmlRpcRequest request) 810 public XmlRpcResponse XmlRpcSearchForRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient)
810 { 811 {
811 Hashtable requestData = (Hashtable)request.Params[0]; 812 Hashtable requestData = (Hashtable)request.Params[0];
812 813