aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
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/Region/Communications
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/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs4
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs6
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs4
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
523 /// </summary> 523 /// </summary>
524 /// <param name="request"></param> 524 /// <param name="request"></param>
525 /// <returns></returns> 525 /// <returns></returns>
526 public XmlRpcResponse LinkRegionRequest(XmlRpcRequest request) 526 public XmlRpcResponse LinkRegionRequest(XmlRpcRequest request, IPEndPoint remoteClient)
527 { 527 {
528 Hashtable requestData = (Hashtable)request.Params[0]; 528 Hashtable requestData = (Hashtable)request.Params[0];
529 //string host = (string)requestData["host"]; 529 //string host = (string)requestData["host"];
@@ -710,7 +710,7 @@ namespace OpenSim.Region.Communications.Hypergrid
710 /// </summary> 710 /// </summary>
711 /// <param name="request"></param> 711 /// <param name="request"></param>
712 /// <returns></returns> 712 /// <returns></returns>
713 public XmlRpcResponse ExpectHGUser(XmlRpcRequest request) 713 public XmlRpcResponse ExpectHGUser(XmlRpcRequest request, IPEndPoint remoteClient)
714 { 714 {
715 Hashtable requestData = (Hashtable)request.Params[0]; 715 Hashtable requestData = (Hashtable)request.Params[0];
716 ForeignUserProfileData userData = new ForeignUserProfileData(); 716 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
177 /// </summary> 177 /// </summary>
178 /// <param name="request"></param> 178 /// <param name="request"></param>
179 /// <returns></returns> 179 /// <returns></returns>
180 public virtual XmlRpcResponse PingCheckReply(XmlRpcRequest request) 180 public virtual XmlRpcResponse PingCheckReply(XmlRpcRequest request, IPEndPoint remoteClient)
181 { 181 {
182 XmlRpcResponse response = new XmlRpcResponse(); 182 XmlRpcResponse response = new XmlRpcResponse();
183 183
@@ -198,7 +198,7 @@ namespace OpenSim.Region.Communications.Hypergrid
198 /// </summary> 198 /// </summary>
199 /// <param name="request"></param> 199 /// <param name="request"></param>
200 /// <returns></returns> 200 /// <returns></returns>
201 public XmlRpcResponse LogOffUser(XmlRpcRequest request) 201 public XmlRpcResponse LogOffUser(XmlRpcRequest request, IPEndPoint remoteClient)
202 { 202 {
203 m_log.Debug("[HGrid]: LogOff User Called"); 203 m_log.Debug("[HGrid]: LogOff User Called");
204 204
@@ -221,7 +221,7 @@ namespace OpenSim.Region.Communications.Hypergrid
221 /// </summary> 221 /// </summary>
222 /// <param name="request"></param> 222 /// <param name="request"></param>
223 /// <returns></returns> 223 /// <returns></returns>
224 public XmlRpcResponse LandData(XmlRpcRequest request) 224 public XmlRpcResponse LandData(XmlRpcRequest request, IPEndPoint remoteClient)
225 { 225 {
226 Hashtable requestData = (Hashtable)request.Params[0]; 226 Hashtable requestData = (Hashtable)request.Params[0];
227 ulong regionHandle = Convert.ToUInt64(requestData["region_handle"]); 227 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
616 /// </summary> 616 /// </summary>
617 /// <param name="request"></param> 617 /// <param name="request"></param>
618 /// <returns></returns> 618 /// <returns></returns>
619 public XmlRpcResponse PingCheckReply(XmlRpcRequest request) 619 public XmlRpcResponse PingCheckReply(XmlRpcRequest request, IPEndPoint remoteClient)
620 { 620 {
621 XmlRpcResponse response = new XmlRpcResponse(); 621 XmlRpcResponse response = new XmlRpcResponse();
622 622
@@ -838,7 +838,7 @@ namespace OpenSim.Region.Communications.OGS1
838 /// </summary> 838 /// </summary>
839 /// <param name="request"></param> 839 /// <param name="request"></param>
840 /// <returns></returns> 840 /// <returns></returns>
841 public XmlRpcResponse LandData(XmlRpcRequest request) 841 public XmlRpcResponse LandData(XmlRpcRequest request, IPEndPoint remoteClient)
842 { 842 {
843 Hashtable requestData = (Hashtable)request.Params[0]; 843 Hashtable requestData = (Hashtable)request.Params[0];
844 ulong regionHandle = Convert.ToUInt64(requestData["region_handle"]); 844 ulong regionHandle = Convert.ToUInt64(requestData["region_handle"]);