aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Services
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/Framework/Communications/Services
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/Framework/Communications/Services')
-rw-r--r--OpenSim/Framework/Communications/Services/GridInfoService.cs3
-rw-r--r--OpenSim/Framework/Communications/Services/HGLoginAuthService.cs8
-rw-r--r--OpenSim/Framework/Communications/Services/LoginService.cs5
3 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/Services/GridInfoService.cs b/OpenSim/Framework/Communications/Services/GridInfoService.cs
index f17bb9f..317dba2 100644
--- a/OpenSim/Framework/Communications/Services/GridInfoService.cs
+++ b/OpenSim/Framework/Communications/Services/GridInfoService.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.IO; 30using System.IO;
31using System.Net;
31using System.Reflection; 32using System.Reflection;
32using System.Text; 33using System.Text;
33using log4net; 34using log4net;
@@ -138,7 +139,7 @@ namespace OpenSim.Framework.Communications.Services
138 } 139 }
139 } 140 }
140 141
141 public XmlRpcResponse XmlRpcGridInfoMethod(XmlRpcRequest request) 142 public XmlRpcResponse XmlRpcGridInfoMethod(XmlRpcRequest request, IPEndPoint remoteClient)
142 { 143 {
143 XmlRpcResponse response = new XmlRpcResponse(); 144 XmlRpcResponse response = new XmlRpcResponse();
144 Hashtable responseData = new Hashtable(); 145 Hashtable responseData = new Hashtable();
diff --git a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
index b62e4a2..3756cf5 100644
--- a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
+++ b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
@@ -86,10 +86,10 @@ namespace OpenSim.Framework.Communications.Services
86 m_serversInfo = sinfo; 86 m_serversInfo = sinfo;
87 } 87 }
88 88
89 public override XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) 89 public override XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request, IPEndPoint remoteClient)
90 { 90 {
91 m_log.Info("[HGLOGIN]: HGLogin called " + request.MethodName); 91 m_log.Info("[HGLOGIN]: HGLogin called " + request.MethodName);
92 XmlRpcResponse response = base.XmlRpcLoginMethod(request); 92 XmlRpcResponse response = base.XmlRpcLoginMethod(request, remoteClient);
93 Hashtable responseData = (Hashtable)response.Value; 93 Hashtable responseData = (Hashtable)response.Value;
94 94
95 responseData["grid_service"] = m_serversInfo.GridURL; 95 responseData["grid_service"] = m_serversInfo.GridURL;
@@ -132,7 +132,7 @@ namespace OpenSim.Framework.Communications.Services
132 return response; 132 return response;
133 } 133 }
134 134
135 public XmlRpcResponse XmlRpcGenerateKeyMethod(XmlRpcRequest request) 135 public XmlRpcResponse XmlRpcGenerateKeyMethod(XmlRpcRequest request, IPEndPoint remoteClient)
136 { 136 {
137 // Verify the key of who's calling 137 // Verify the key of who's calling
138 UUID userID = UUID.Zero; 138 UUID userID = UUID.Zero;
@@ -157,7 +157,7 @@ namespace OpenSim.Framework.Communications.Services
157 return response; 157 return response;
158 } 158 }
159 159
160 public XmlRpcResponse XmlRpcVerifyKeyMethod(XmlRpcRequest request) 160 public XmlRpcResponse XmlRpcVerifyKeyMethod(XmlRpcRequest request, IPEndPoint remoteClient)
161 { 161 {
162 bool success = false; 162 bool success = false;
163 163
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index f55c030..6859827 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.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.Text.RegularExpressions; 34using System.Text.RegularExpressions;
34using System.Threading; 35using System.Threading;
@@ -97,7 +98,7 @@ namespace OpenSim.Framework.Communications.Services
97 /// </summary> 98 /// </summary>
98 /// <param name="request">The XMLRPC request</param> 99 /// <param name="request">The XMLRPC request</param>
99 /// <returns>The response to send</returns> 100 /// <returns>The response to send</returns>
100 public virtual XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) 101 public virtual XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request, IPEndPoint remoteClient)
101 { 102 {
102 // Temporary fix 103 // Temporary fix
103 m_loginMutex.WaitOne(); 104 m_loginMutex.WaitOne();
@@ -1125,7 +1126,7 @@ namespace OpenSim.Framework.Communications.Services
1125 return false; 1126 return false;
1126 } 1127 }
1127 1128
1128 public XmlRpcResponse XmlRPCCheckAuthSession(XmlRpcRequest request) 1129 public XmlRpcResponse XmlRPCCheckAuthSession(XmlRpcRequest request, IPEndPoint remoteClient)
1129 { 1130 {
1130 XmlRpcResponse response = new XmlRpcResponse(); 1131 XmlRpcResponse response = new XmlRpcResponse();
1131 Hashtable requestData = (Hashtable)request.Params[0]; 1132 Hashtable requestData = (Hashtable)request.Params[0];