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 | |
parent | * Breaks OpenSim.. err I mean.. adds NAT translation support to EnableSimulat... (diff) | |
download | opensim-SC-31baeef469d72a9dc13cf4f56392b9f740f71cba.zip opensim-SC-31baeef469d72a9dc13cf4f56392b9f740f71cba.tar.gz opensim-SC-31baeef469d72a9dc13cf4f56392b9f740f71cba.tar.bz2 opensim-SC-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 '')
27 files changed, 109 insertions, 95 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 3a4a68f..f29cca4 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -171,7 +171,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
171 | } | 171 | } |
172 | } | 172 | } |
173 | 173 | ||
174 | public XmlRpcResponse XmlRpcRestartMethod(XmlRpcRequest request) | 174 | public XmlRpcResponse XmlRpcRestartMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
175 | { | 175 | { |
176 | XmlRpcResponse response = new XmlRpcResponse(); | 176 | XmlRpcResponse response = new XmlRpcResponse(); |
177 | Hashtable responseData = new Hashtable(); | 177 | Hashtable responseData = new Hashtable(); |
@@ -219,7 +219,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
219 | return response; | 219 | return response; |
220 | } | 220 | } |
221 | 221 | ||
222 | public XmlRpcResponse XmlRpcAlertMethod(XmlRpcRequest request) | 222 | public XmlRpcResponse XmlRpcAlertMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
223 | { | 223 | { |
224 | XmlRpcResponse response = new XmlRpcResponse(); | 224 | XmlRpcResponse response = new XmlRpcResponse(); |
225 | Hashtable responseData = new Hashtable(); | 225 | Hashtable responseData = new Hashtable(); |
@@ -266,7 +266,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
266 | return response; | 266 | return response; |
267 | } | 267 | } |
268 | 268 | ||
269 | public XmlRpcResponse XmlRpcLoadHeightmapMethod(XmlRpcRequest request) | 269 | public XmlRpcResponse XmlRpcLoadHeightmapMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
270 | { | 270 | { |
271 | XmlRpcResponse response = new XmlRpcResponse(); | 271 | XmlRpcResponse response = new XmlRpcResponse(); |
272 | Hashtable responseData = new Hashtable(); | 272 | Hashtable responseData = new Hashtable(); |
@@ -323,7 +323,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
323 | return response; | 323 | return response; |
324 | } | 324 | } |
325 | 325 | ||
326 | public XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request) | 326 | public XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
327 | { | 327 | { |
328 | 328 | ||
329 | m_log.Info("[RADMIN]: Received Shutdown Administrator Request"); | 329 | m_log.Info("[RADMIN]: Received Shutdown Administrator Request"); |
@@ -450,7 +450,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
450 | /// <description>name of the newly created region</description></item> | 450 | /// <description>name of the newly created region</description></item> |
451 | /// </list> | 451 | /// </list> |
452 | /// </remarks> | 452 | /// </remarks> |
453 | public XmlRpcResponse XmlRpcCreateRegionMethod(XmlRpcRequest request) | 453 | public XmlRpcResponse XmlRpcCreateRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
454 | { | 454 | { |
455 | m_log.Info("[RADMIN]: CreateRegion: new request"); | 455 | m_log.Info("[RADMIN]: CreateRegion: new request"); |
456 | XmlRpcResponse response = new XmlRpcResponse(); | 456 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -686,7 +686,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
686 | /// <description>error message if success is false</description></item> | 686 | /// <description>error message if success is false</description></item> |
687 | /// </list> | 687 | /// </list> |
688 | /// </remarks> | 688 | /// </remarks> |
689 | public XmlRpcResponse XmlRpcDeleteRegionMethod(XmlRpcRequest request) | 689 | public XmlRpcResponse XmlRpcDeleteRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
690 | { | 690 | { |
691 | m_log.Info("[RADMIN]: DeleteRegion: new request"); | 691 | m_log.Info("[RADMIN]: DeleteRegion: new request"); |
692 | XmlRpcResponse response = new XmlRpcResponse(); | 692 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -760,7 +760,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
760 | /// </list> | 760 | /// </list> |
761 | /// </remarks> | 761 | /// </remarks> |
762 | 762 | ||
763 | public XmlRpcResponse XmlRpcModifyRegionMethod(XmlRpcRequest request) | 763 | public XmlRpcResponse XmlRpcModifyRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
764 | { | 764 | { |
765 | m_log.Info("[RADMIN]: ModifyRegion: new request"); | 765 | m_log.Info("[RADMIN]: ModifyRegion: new request"); |
766 | XmlRpcResponse response = new XmlRpcResponse(); | 766 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -861,7 +861,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
861 | /// </description></item> | 861 | /// </description></item> |
862 | /// </list> | 862 | /// </list> |
863 | /// </remarks> | 863 | /// </remarks> |
864 | public XmlRpcResponse XmlRpcCreateUserMethod(XmlRpcRequest request) | 864 | public XmlRpcResponse XmlRpcCreateUserMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
865 | { | 865 | { |
866 | m_log.Info("[RADMIN]: CreateUser: new request"); | 866 | m_log.Info("[RADMIN]: CreateUser: new request"); |
867 | XmlRpcResponse response = new XmlRpcResponse(); | 867 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -967,7 +967,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
967 | /// <description>error message if success is false</description></item> | 967 | /// <description>error message if success is false</description></item> |
968 | /// </list> | 968 | /// </list> |
969 | /// </remarks> | 969 | /// </remarks> |
970 | public XmlRpcResponse XmlRpcUserExistsMethod(XmlRpcRequest request) | 970 | public XmlRpcResponse XmlRpcUserExistsMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
971 | { | 971 | { |
972 | m_log.Info("[RADMIN]: UserExists: new request"); | 972 | m_log.Info("[RADMIN]: UserExists: new request"); |
973 | XmlRpcResponse response = new XmlRpcResponse(); | 973 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -1050,7 +1050,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1050 | /// </list> | 1050 | /// </list> |
1051 | /// </remarks> | 1051 | /// </remarks> |
1052 | 1052 | ||
1053 | public XmlRpcResponse XmlRpcUpdateUserAccountMethod(XmlRpcRequest request) | 1053 | public XmlRpcResponse XmlRpcUpdateUserAccountMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
1054 | { | 1054 | { |
1055 | m_log.Info("[RADMIN]: UpdateUserAccount: new request"); | 1055 | m_log.Info("[RADMIN]: UpdateUserAccount: new request"); |
1056 | XmlRpcResponse response = new XmlRpcResponse(); | 1056 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -1706,7 +1706,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1706 | /// <description>error message if success is false</description></item> | 1706 | /// <description>error message if success is false</description></item> |
1707 | /// </list> | 1707 | /// </list> |
1708 | /// </remarks> | 1708 | /// </remarks> |
1709 | public XmlRpcResponse XmlRpcLoadOARMethod(XmlRpcRequest request) | 1709 | public XmlRpcResponse XmlRpcLoadOARMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
1710 | { | 1710 | { |
1711 | m_log.Info("[RADMIN]: Received Load OAR Administrator Request"); | 1711 | m_log.Info("[RADMIN]: Received Load OAR Administrator Request"); |
1712 | XmlRpcResponse response = new XmlRpcResponse(); | 1712 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -1805,7 +1805,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1805 | /// <description>error message if success is false</description></item> | 1805 | /// <description>error message if success is false</description></item> |
1806 | /// </list> | 1806 | /// </list> |
1807 | /// </remarks> | 1807 | /// </remarks> |
1808 | public XmlRpcResponse XmlRpcSaveOARMethod(XmlRpcRequest request) | 1808 | public XmlRpcResponse XmlRpcSaveOARMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
1809 | { | 1809 | { |
1810 | m_log.Info("[RADMIN]: Received Save OAR Administrator Request"); | 1810 | m_log.Info("[RADMIN]: Received Save OAR Administrator Request"); |
1811 | XmlRpcResponse response = new XmlRpcResponse(); | 1811 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -1884,7 +1884,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1884 | lock (SOLock) Monitor.Pulse(SOLock); | 1884 | lock (SOLock) Monitor.Pulse(SOLock); |
1885 | } | 1885 | } |
1886 | 1886 | ||
1887 | public XmlRpcResponse XmlRpcLoadXMLMethod(XmlRpcRequest request) | 1887 | public XmlRpcResponse XmlRpcLoadXMLMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
1888 | { | 1888 | { |
1889 | m_log.Info("[RADMIN]: Received Load XML Administrator Request"); | 1889 | m_log.Info("[RADMIN]: Received Load XML Administrator Request"); |
1890 | XmlRpcResponse response = new XmlRpcResponse(); | 1890 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -1969,7 +1969,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1969 | } | 1969 | } |
1970 | 1970 | ||
1971 | 1971 | ||
1972 | public XmlRpcResponse XmlRpcSaveXMLMethod(XmlRpcRequest request) | 1972 | public XmlRpcResponse XmlRpcSaveXMLMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
1973 | { | 1973 | { |
1974 | m_log.Info("[RADMIN]: Received Save XML Administrator Request"); | 1974 | m_log.Info("[RADMIN]: Received Save XML Administrator Request"); |
1975 | XmlRpcResponse response = new XmlRpcResponse(); | 1975 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -2051,7 +2051,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2051 | return response; | 2051 | return response; |
2052 | } | 2052 | } |
2053 | 2053 | ||
2054 | public XmlRpcResponse XmlRpcRegionQueryMethod(XmlRpcRequest request) | 2054 | public XmlRpcResponse XmlRpcRegionQueryMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
2055 | { | 2055 | { |
2056 | m_log.Info("[RADMIN]: Received Query XML Administrator Request"); | 2056 | m_log.Info("[RADMIN]: Received Query XML Administrator Request"); |
2057 | XmlRpcResponse response = new XmlRpcResponse(); | 2057 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -2107,7 +2107,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2107 | return response; | 2107 | return response; |
2108 | } | 2108 | } |
2109 | 2109 | ||
2110 | public XmlRpcResponse XmlRpcConsoleCommandMethod(XmlRpcRequest request) | 2110 | public XmlRpcResponse XmlRpcConsoleCommandMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
2111 | { | 2111 | { |
2112 | m_log.Info("[RADMIN]: Received Command XML Administrator Request"); | 2112 | m_log.Info("[RADMIN]: Received Command XML Administrator Request"); |
2113 | XmlRpcResponse response = new XmlRpcResponse(); | 2113 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -2145,7 +2145,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2145 | return response; | 2145 | return response; |
2146 | } | 2146 | } |
2147 | 2147 | ||
2148 | public XmlRpcResponse XmlRpcAccessListClear(XmlRpcRequest request) | 2148 | public XmlRpcResponse XmlRpcAccessListClear(XmlRpcRequest request, IPEndPoint remoteClient) |
2149 | { | 2149 | { |
2150 | 2150 | ||
2151 | m_log.Info("[RADMIN]: Received Access List Clear Request"); | 2151 | m_log.Info("[RADMIN]: Received Access List Clear Request"); |
@@ -2200,7 +2200,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2200 | return response; | 2200 | return response; |
2201 | } | 2201 | } |
2202 | 2202 | ||
2203 | public XmlRpcResponse XmlRpcAccessListAdd(XmlRpcRequest request) | 2203 | public XmlRpcResponse XmlRpcAccessListAdd(XmlRpcRequest request, IPEndPoint remoteClient) |
2204 | { | 2204 | { |
2205 | 2205 | ||
2206 | m_log.Info("[RADMIN]: Received Access List Add Request"); | 2206 | m_log.Info("[RADMIN]: Received Access List Add Request"); |
@@ -2284,7 +2284,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2284 | return response; | 2284 | return response; |
2285 | } | 2285 | } |
2286 | 2286 | ||
2287 | public XmlRpcResponse XmlRpcAccessListRemove(XmlRpcRequest request) | 2287 | public XmlRpcResponse XmlRpcAccessListRemove(XmlRpcRequest request, IPEndPoint remoteClient) |
2288 | { | 2288 | { |
2289 | 2289 | ||
2290 | m_log.Info("[RADMIN]: Received Access List Remove Request"); | 2290 | m_log.Info("[RADMIN]: Received Access List Remove Request"); |
@@ -2367,7 +2367,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2367 | return response; | 2367 | return response; |
2368 | } | 2368 | } |
2369 | 2369 | ||
2370 | public XmlRpcResponse XmlRpcAccessListList(XmlRpcRequest request) | 2370 | public XmlRpcResponse XmlRpcAccessListList(XmlRpcRequest request, IPEndPoint remoteClient) |
2371 | { | 2371 | { |
2372 | 2372 | ||
2373 | m_log.Info("[RADMIN]: Received Access List List Request"); | 2373 | m_log.Info("[RADMIN]: Received Access List List Request"); |
diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs index b7b9adb..88b7972 100644 --- a/OpenSim/Client/Linden/LLProxyLoginModule.cs +++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs | |||
@@ -175,7 +175,7 @@ namespace OpenSim.Client.Linden | |||
175 | /// </summary> | 175 | /// </summary> |
176 | /// <param name="request"></param> | 176 | /// <param name="request"></param> |
177 | /// <returns></returns> | 177 | /// <returns></returns> |
178 | public XmlRpcResponse ExpectUser(XmlRpcRequest request) | 178 | public XmlRpcResponse ExpectUser(XmlRpcRequest request, IPEndPoint remoteClient) |
179 | { | 179 | { |
180 | Hashtable requestData = (Hashtable)request.Params[0]; | 180 | Hashtable requestData = (Hashtable)request.Params[0]; |
181 | AgentCircuitData agentData = new AgentCircuitData(); | 181 | AgentCircuitData agentData = new AgentCircuitData(); |
@@ -285,7 +285,7 @@ namespace OpenSim.Client.Linden | |||
285 | /// </summary> | 285 | /// </summary> |
286 | /// <param name="request"></param> | 286 | /// <param name="request"></param> |
287 | /// <returns></returns> | 287 | /// <returns></returns> |
288 | public XmlRpcResponse LogOffUser(XmlRpcRequest request) | 288 | public XmlRpcResponse LogOffUser(XmlRpcRequest request, IPEndPoint remoteClient) |
289 | { | 289 | { |
290 | m_log.Debug("[CONNECTION DEBUGGING]: LogOff User Called"); | 290 | m_log.Debug("[CONNECTION DEBUGGING]: LogOff User Called"); |
291 | 291 | ||
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 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Net; | ||
31 | using System.Reflection; | 32 | using System.Reflection; |
32 | using System.Text; | 33 | using System.Text; |
33 | using log4net; | 34 | using 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; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Net; | ||
32 | using System.Reflection; | 33 | using System.Reflection; |
33 | using System.Text.RegularExpressions; | 34 | using System.Text.RegularExpressions; |
34 | using System.Threading; | 35 | using 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]; |
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs index 7d75faa..a2a388e 100644 --- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs | |||
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
103 | 103 | ||
104 | XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); | 104 | XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); |
105 | 105 | ||
106 | XmlRpcResponse response = loginService.XmlRpcLoginMethod(request); | 106 | XmlRpcResponse response = loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); |
107 | Hashtable responseData = (Hashtable)response.Value; | 107 | Hashtable responseData = (Hashtable)response.Value; |
108 | 108 | ||
109 | Assert.That(responseData["first_name"], Is.EqualTo(m_firstName)); | 109 | Assert.That(responseData["first_name"], Is.EqualTo(m_firstName)); |
@@ -140,7 +140,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
140 | 140 | ||
141 | XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); | 141 | XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); |
142 | 142 | ||
143 | XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request); | 143 | XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); |
144 | Hashtable responseData = (Hashtable)response.Value; | 144 | Hashtable responseData = (Hashtable)response.Value; |
145 | 145 | ||
146 | UserAgentData uagent = m_userProfileData.CurrentAgent; | 146 | UserAgentData uagent = m_userProfileData.CurrentAgent; |
@@ -194,7 +194,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
194 | 194 | ||
195 | XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); | 195 | XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); |
196 | 196 | ||
197 | XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request); | 197 | XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); |
198 | Hashtable responseData = (Hashtable)response.Value; | 198 | Hashtable responseData = (Hashtable)response.Value; |
199 | 199 | ||
200 | ArrayList friendslist = (ArrayList) responseData["buddy-list"]; | 200 | ArrayList friendslist = (ArrayList) responseData["buddy-list"]; |
@@ -231,7 +231,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
231 | 231 | ||
232 | XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); | 232 | XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); |
233 | 233 | ||
234 | XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request); | 234 | XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); |
235 | Hashtable responseData = (Hashtable)response.Value; | 235 | Hashtable responseData = (Hashtable)response.Value; |
236 | Assert.That(responseData["message"], Is.EqualTo(error_auth_message)); | 236 | Assert.That(responseData["message"], Is.EqualTo(error_auth_message)); |
237 | 237 | ||
@@ -256,7 +256,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
256 | 256 | ||
257 | XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); | 257 | XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); |
258 | 258 | ||
259 | XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request); | 259 | XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); |
260 | Hashtable responseData = (Hashtable)response.Value; | 260 | Hashtable responseData = (Hashtable)response.Value; |
261 | Assert.That(responseData["message"], Is.EqualTo(error_auth_message)); | 261 | Assert.That(responseData["message"], Is.EqualTo(error_auth_message)); |
262 | 262 | ||
@@ -281,7 +281,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
281 | 281 | ||
282 | XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); | 282 | XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); |
283 | 283 | ||
284 | XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request); | 284 | XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); |
285 | Hashtable responseData = (Hashtable)response.Value; | 285 | Hashtable responseData = (Hashtable)response.Value; |
286 | Assert.That(responseData["message"], Is.EqualTo(error_xml_message)); | 286 | Assert.That(responseData["message"], Is.EqualTo(error_xml_message)); |
287 | 287 | ||
@@ -312,20 +312,20 @@ namespace OpenSim.Framework.Communications.Tests | |||
312 | 312 | ||
313 | // First we log in. | 313 | // First we log in. |
314 | XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); | 314 | XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams); |
315 | XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request); | 315 | XmlRpcResponse response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); |
316 | Hashtable responseData = (Hashtable)response.Value; | 316 | Hashtable responseData = (Hashtable)response.Value; |
317 | Assert.That(responseData["message"], Is.EqualTo("Hello folks")); | 317 | Assert.That(responseData["message"], Is.EqualTo("Hello folks")); |
318 | 318 | ||
319 | // Then we try again, this time expecting failure. | 319 | // Then we try again, this time expecting failure. |
320 | request = new XmlRpcRequest("login_to_simulator", sendParams); | 320 | request = new XmlRpcRequest("login_to_simulator", sendParams); |
321 | response = m_loginService.XmlRpcLoginMethod(request); | 321 | response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); |
322 | responseData = (Hashtable)response.Value; | 322 | responseData = (Hashtable)response.Value; |
323 | Assert.That(responseData["message"], Is.EqualTo(error_already_logged)); | 323 | Assert.That(responseData["message"], Is.EqualTo(error_already_logged)); |
324 | 324 | ||
325 | // Finally the third time we should be able to get right back in. | 325 | // Finally the third time we should be able to get right back in. |
326 | request = new XmlRpcRequest("login_to_simulator", sendParams); | 326 | request = new XmlRpcRequest("login_to_simulator", sendParams); |
327 | 327 | ||
328 | response = m_loginService.XmlRpcLoginMethod(request); | 328 | response = m_loginService.XmlRpcLoginMethod(request, new IPEndPoint(Util.GetLocalHost(), 80)); |
329 | responseData = (Hashtable)response.Value; | 329 | responseData = (Hashtable)response.Value; |
330 | Assert.That(responseData["message"], Is.EqualTo("Hello folks")); | 330 | Assert.That(responseData["message"], Is.EqualTo("Hello folks")); |
331 | 331 | ||
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 5778214..8fb2082 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -612,7 +612,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
612 | 612 | ||
613 | try | 613 | try |
614 | { | 614 | { |
615 | xmlRpcResponse = method(xmlRprcRequest); | 615 | xmlRpcResponse = method(xmlRprcRequest, request.RemoteIPEndPoint); |
616 | } | 616 | } |
617 | catch(Exception e) | 617 | catch(Exception e) |
618 | { | 618 | { |
diff --git a/OpenSim/Framework/Servers/HttpServer/XmlRpcMethod.cs b/OpenSim/Framework/Servers/HttpServer/XmlRpcMethod.cs index 843b3f7..62ebe62 100644 --- a/OpenSim/Framework/Servers/HttpServer/XmlRpcMethod.cs +++ b/OpenSim/Framework/Servers/HttpServer/XmlRpcMethod.cs | |||
@@ -25,9 +25,10 @@ | |||
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 Nwc.XmlRpc; | 29 | using Nwc.XmlRpc; |
29 | 30 | ||
30 | namespace OpenSim.Framework.Servers.HttpServer | 31 | namespace OpenSim.Framework.Servers.HttpServer |
31 | { | 32 | { |
32 | public delegate XmlRpcResponse XmlRpcMethod(XmlRpcRequest request); | 33 | public delegate XmlRpcResponse XmlRpcMethod(XmlRpcRequest request, IPEndPoint client); |
33 | } | 34 | } |
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 @@ | |||
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.Text; | 33 | using System.Text; |
33 | using Nwc.XmlRpc; | 34 | using 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; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Net; | ||
32 | using System.Reflection; | 33 | using System.Reflection; |
33 | using System.Xml; | 34 | using System.Xml; |
34 | using log4net; | 35 | using 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 | ||
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs index f7ef759..f158591 100644 --- a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs +++ b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs | |||
@@ -181,7 +181,7 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
181 | return regionProfile; | 181 | return regionProfile; |
182 | } | 182 | } |
183 | 183 | ||
184 | public XmlRpcResponse RegionStartup(XmlRpcRequest request) | 184 | public XmlRpcResponse RegionStartup(XmlRpcRequest request, IPEndPoint remoteClient) |
185 | { | 185 | { |
186 | Hashtable requestData = (Hashtable)request.Params[0]; | 186 | Hashtable requestData = (Hashtable)request.Params[0]; |
187 | Hashtable result = new Hashtable(); | 187 | Hashtable result = new Hashtable(); |
@@ -195,7 +195,7 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
195 | return response; | 195 | return response; |
196 | } | 196 | } |
197 | 197 | ||
198 | public XmlRpcResponse RegionShutdown(XmlRpcRequest request) | 198 | public XmlRpcResponse RegionShutdown(XmlRpcRequest request, IPEndPoint remoteClient) |
199 | { | 199 | { |
200 | Hashtable requestData = (Hashtable)request.Params[0]; | 200 | Hashtable requestData = (Hashtable)request.Params[0]; |
201 | Hashtable result = new Hashtable(); | 201 | Hashtable result = new Hashtable(); |
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs index bff17df..99fe264 100644 --- a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs +++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs | |||
@@ -322,7 +322,7 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
322 | /// </summary> | 322 | /// </summary> |
323 | /// <param name="request">UserServer Data</param> | 323 | /// <param name="request">UserServer Data</param> |
324 | /// <returns></returns> | 324 | /// <returns></returns> |
325 | public XmlRpcResponse UserLoggedOn(XmlRpcRequest request) | 325 | public XmlRpcResponse UserLoggedOn(XmlRpcRequest request, IPEndPoint remoteClient) |
326 | { | 326 | { |
327 | Hashtable requestData = (Hashtable)request.Params[0]; | 327 | Hashtable requestData = (Hashtable)request.Params[0]; |
328 | 328 | ||
@@ -370,7 +370,7 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
370 | /// </summary> | 370 | /// </summary> |
371 | /// <param name="request"></param> | 371 | /// <param name="request"></param> |
372 | /// <returns></returns> | 372 | /// <returns></returns> |
373 | public XmlRpcResponse UserLoggedOff(XmlRpcRequest request) | 373 | public XmlRpcResponse UserLoggedOff(XmlRpcRequest request, IPEndPoint remoteClient) |
374 | { | 374 | { |
375 | m_log.Info("[USERLOGOFF]: User logged off called"); | 375 | m_log.Info("[USERLOGOFF]: User logged off called"); |
376 | Hashtable requestData = (Hashtable)request.Params[0]; | 376 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -383,7 +383,7 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
383 | 383 | ||
384 | #endregion | 384 | #endregion |
385 | 385 | ||
386 | public XmlRpcResponse GetPresenceInfoBulk(XmlRpcRequest request) | 386 | public XmlRpcResponse GetPresenceInfoBulk(XmlRpcRequest request, IPEndPoint remoteClient) |
387 | { | 387 | { |
388 | Hashtable paramHash = (Hashtable)request.Params[0]; | 388 | Hashtable paramHash = (Hashtable)request.Params[0]; |
389 | Hashtable result = new Hashtable(); | 389 | Hashtable result = new Hashtable(); |
@@ -426,7 +426,7 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
426 | } | 426 | } |
427 | } | 427 | } |
428 | 428 | ||
429 | public XmlRpcResponse AgentLocation(XmlRpcRequest request) | 429 | public XmlRpcResponse AgentLocation(XmlRpcRequest request, IPEndPoint remoteClient) |
430 | { | 430 | { |
431 | Hashtable requestData = (Hashtable)request.Params[0]; | 431 | Hashtable requestData = (Hashtable)request.Params[0]; |
432 | Hashtable result = new Hashtable(); | 432 | Hashtable result = new Hashtable(); |
@@ -441,7 +441,7 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
441 | return response; | 441 | return response; |
442 | } | 442 | } |
443 | 443 | ||
444 | public XmlRpcResponse AgentLeaving(XmlRpcRequest request) | 444 | public XmlRpcResponse AgentLeaving(XmlRpcRequest request, IPEndPoint remoteClient) |
445 | { | 445 | { |
446 | Hashtable requestData = (Hashtable)request.Params[0]; | 446 | Hashtable requestData = (Hashtable)request.Params[0]; |
447 | Hashtable result = new Hashtable(); | 447 | Hashtable result = new Hashtable(); |
@@ -455,7 +455,7 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
455 | return response; | 455 | return response; |
456 | } | 456 | } |
457 | 457 | ||
458 | public XmlRpcResponse ProcessRegionShutdown(XmlRpcRequest request) | 458 | public XmlRpcResponse ProcessRegionShutdown(XmlRpcRequest request, IPEndPoint remoteClient) |
459 | { | 459 | { |
460 | Hashtable requestData = (Hashtable)request.Params[0]; | 460 | Hashtable requestData = (Hashtable)request.Params[0]; |
461 | Hashtable result = new Hashtable(); | 461 | Hashtable result = new Hashtable(); |
diff --git a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs index 330ced2..f326100 100644 --- a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs +++ b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs | |||
@@ -166,7 +166,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
166 | } | 166 | } |
167 | 167 | ||
168 | } | 168 | } |
169 | public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request) | 169 | public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request, IPEndPoint remoteClient) |
170 | { | 170 | { |
171 | XmlRpcResponse response = new XmlRpcResponse(); | 171 | XmlRpcResponse response = new XmlRpcResponse(); |
172 | Hashtable requestData = (Hashtable)request.Params[0]; | 172 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -187,7 +187,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
187 | } | 187 | } |
188 | return response; | 188 | return response; |
189 | } | 189 | } |
190 | public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request) | 190 | public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request, IPEndPoint remoteClient) |
191 | { | 191 | { |
192 | XmlRpcResponse response = new XmlRpcResponse(); | 192 | XmlRpcResponse response = new XmlRpcResponse(); |
193 | Hashtable requestData = (Hashtable)request.Params[0]; | 193 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -203,7 +203,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
203 | } | 203 | } |
204 | return response; | 204 | return response; |
205 | } | 205 | } |
206 | public XmlRpcResponse XmlRPCUserMovedtoRegion(XmlRpcRequest request) | 206 | public XmlRpcResponse XmlRPCUserMovedtoRegion(XmlRpcRequest request, IPEndPoint remoteClient) |
207 | { | 207 | { |
208 | XmlRpcResponse response = new XmlRpcResponse(); | 208 | XmlRpcResponse response = new XmlRpcResponse(); |
209 | Hashtable requestData = (Hashtable)request.Params[0]; | 209 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -430,7 +430,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
430 | } | 430 | } |
431 | } | 431 | } |
432 | 432 | ||
433 | public XmlRpcResponse RegionStartup(XmlRpcRequest request) | 433 | public XmlRpcResponse RegionStartup(XmlRpcRequest request, IPEndPoint remoteClient) |
434 | { | 434 | { |
435 | Hashtable requestData = (Hashtable)request.Params[0]; | 435 | Hashtable requestData = (Hashtable)request.Params[0]; |
436 | Hashtable result = new Hashtable(); | 436 | Hashtable result = new Hashtable(); |
@@ -449,7 +449,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
449 | return response; | 449 | return response; |
450 | } | 450 | } |
451 | 451 | ||
452 | public XmlRpcResponse RegionShutdown(XmlRpcRequest request) | 452 | public XmlRpcResponse RegionShutdown(XmlRpcRequest request, IPEndPoint remoteClient) |
453 | { | 453 | { |
454 | Hashtable requestData = (Hashtable)request.Params[0]; | 454 | Hashtable requestData = (Hashtable)request.Params[0]; |
455 | Hashtable result = new Hashtable(); | 455 | Hashtable result = new Hashtable(); |
@@ -468,7 +468,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
468 | return response; | 468 | return response; |
469 | } | 469 | } |
470 | 470 | ||
471 | public XmlRpcResponse AgentLocation(XmlRpcRequest request) | 471 | public XmlRpcResponse AgentLocation(XmlRpcRequest request, IPEndPoint remoteClient) |
472 | { | 472 | { |
473 | Hashtable requestData = (Hashtable)request.Params[0]; | 473 | Hashtable requestData = (Hashtable)request.Params[0]; |
474 | Hashtable result = new Hashtable(); | 474 | Hashtable result = new Hashtable(); |
@@ -489,7 +489,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
489 | return response; | 489 | return response; |
490 | } | 490 | } |
491 | 491 | ||
492 | public XmlRpcResponse AgentLeaving(XmlRpcRequest request) | 492 | public XmlRpcResponse AgentLeaving(XmlRpcRequest request, IPEndPoint remoteClient) |
493 | { | 493 | { |
494 | Hashtable requestData = (Hashtable)request.Params[0]; | 494 | Hashtable requestData = (Hashtable)request.Params[0]; |
495 | Hashtable result = new Hashtable(); | 495 | Hashtable result = new Hashtable(); |
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs index 9eb8743..8fd9c6d 100644 --- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs +++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.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.Text.RegularExpressions; | 33 | using System.Text.RegularExpressions; |
33 | using log4net; | 34 | using log4net; |
@@ -368,7 +369,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
368 | return true; | 369 | return true; |
369 | } | 370 | } |
370 | 371 | ||
371 | public XmlRpcResponse XmlRPCSetLoginParams(XmlRpcRequest request) | 372 | public XmlRpcResponse XmlRPCSetLoginParams(XmlRpcRequest request, IPEndPoint remoteClient) |
372 | { | 373 | { |
373 | XmlRpcResponse response = new XmlRpcResponse(); | 374 | XmlRpcResponse response = new XmlRpcResponse(); |
374 | Hashtable requestData = (Hashtable)request.Params[0]; | 375 | Hashtable requestData = (Hashtable)request.Params[0]; |
diff --git a/OpenSim/Grid/UserServer.Modules/UserManager.cs b/OpenSim/Grid/UserServer.Modules/UserManager.cs index 6f2720a..8fb3de5 100644 --- a/OpenSim/Grid/UserServer.Modules/UserManager.cs +++ b/OpenSim/Grid/UserServer.Modules/UserManager.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 Nwc.XmlRpc; | 34 | using Nwc.XmlRpc; |
@@ -201,7 +202,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
201 | 202 | ||
202 | #region XMLRPC User Methods | 203 | #region XMLRPC User Methods |
203 | 204 | ||
204 | public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request) | 205 | public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request, IPEndPoint remoteClient) |
205 | { | 206 | { |
206 | // XmlRpcResponse response = new XmlRpcResponse(); | 207 | // XmlRpcResponse response = new XmlRpcResponse(); |
207 | Hashtable requestData = (Hashtable)request.Params[0]; | 208 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -218,7 +219,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
218 | return AvatarPickerListtoXmlRPCResponse(queryID, returnAvatar); | 219 | return AvatarPickerListtoXmlRPCResponse(queryID, returnAvatar); |
219 | } | 220 | } |
220 | 221 | ||
221 | public XmlRpcResponse XmlRPCAtRegion(XmlRpcRequest request) | 222 | public XmlRpcResponse XmlRPCAtRegion(XmlRpcRequest request, IPEndPoint remoteClient) |
222 | { | 223 | { |
223 | XmlRpcResponse response = new XmlRpcResponse(); | 224 | XmlRpcResponse response = new XmlRpcResponse(); |
224 | Hashtable requestData = (Hashtable)request.Params[0]; | 225 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -253,7 +254,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
253 | return response; | 254 | return response; |
254 | } | 255 | } |
255 | 256 | ||
256 | public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request) | 257 | public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request, IPEndPoint remoteClient) |
257 | { | 258 | { |
258 | // XmlRpcResponse response = new XmlRpcResponse(); | 259 | // XmlRpcResponse response = new XmlRpcResponse(); |
259 | Hashtable requestData = (Hashtable)request.Params[0]; | 260 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -290,7 +291,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
290 | return ProfileToXmlRPCResponse(userProfile); | 291 | return ProfileToXmlRPCResponse(userProfile); |
291 | } | 292 | } |
292 | 293 | ||
293 | public XmlRpcResponse XmlRPCGetUserMethodUUID(XmlRpcRequest request) | 294 | public XmlRpcResponse XmlRPCGetUserMethodUUID(XmlRpcRequest request, IPEndPoint remoteClient) |
294 | { | 295 | { |
295 | // XmlRpcResponse response = new XmlRpcResponse(); | 296 | // XmlRpcResponse response = new XmlRpcResponse(); |
296 | Hashtable requestData = (Hashtable)request.Params[0]; | 297 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -323,7 +324,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
323 | return ProfileToXmlRPCResponse(userProfile); | 324 | return ProfileToXmlRPCResponse(userProfile); |
324 | } | 325 | } |
325 | 326 | ||
326 | public XmlRpcResponse XmlRPCGetAgentMethodUUID(XmlRpcRequest request) | 327 | public XmlRpcResponse XmlRPCGetAgentMethodUUID(XmlRpcRequest request, IPEndPoint remoteClient) |
327 | { | 328 | { |
328 | XmlRpcResponse response = new XmlRpcResponse(); | 329 | XmlRpcResponse response = new XmlRpcResponse(); |
329 | Hashtable requestData = (Hashtable)request.Params[0]; | 330 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -372,7 +373,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
372 | return response; | 373 | return response; |
373 | } | 374 | } |
374 | 375 | ||
375 | public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserProfile(XmlRpcRequest request) | 376 | public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserProfile(XmlRpcRequest request, IPEndPoint remoteClient) |
376 | { | 377 | { |
377 | m_log.Debug("[UserManager]: Got request to update user profile"); | 378 | m_log.Debug("[UserManager]: Got request to update user profile"); |
378 | XmlRpcResponse response = new XmlRpcResponse(); | 379 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -565,7 +566,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
565 | return response; | 566 | return response; |
566 | } | 567 | } |
567 | 568 | ||
568 | public XmlRpcResponse XmlRPCLogOffUserMethodUUID(XmlRpcRequest request) | 569 | public XmlRpcResponse XmlRPCLogOffUserMethodUUID(XmlRpcRequest request, IPEndPoint remoteClient) |
569 | { | 570 | { |
570 | XmlRpcResponse response = new XmlRpcResponse(); | 571 | XmlRpcResponse response = new XmlRpcResponse(); |
571 | Hashtable requestData = (Hashtable)request.Params[0]; | 572 | Hashtable requestData = (Hashtable)request.Params[0]; |
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs index 4ed8597..a7ebc85 100644 --- a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs +++ b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.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 Nwc.XmlRpc; | 34 | using Nwc.XmlRpc; |
@@ -70,7 +71,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
70 | m_httpServer.AddXmlRPCHandler("update_avatar_appearance", XmlRPCUpdateAvatarAppearance); | 71 | m_httpServer.AddXmlRPCHandler("update_avatar_appearance", XmlRPCUpdateAvatarAppearance); |
71 | } | 72 | } |
72 | 73 | ||
73 | public XmlRpcResponse XmlRPCGetAvatarAppearance(XmlRpcRequest request) | 74 | public XmlRpcResponse XmlRPCGetAvatarAppearance(XmlRpcRequest request, IPEndPoint remoteClient) |
74 | { | 75 | { |
75 | XmlRpcResponse response = new XmlRpcResponse(); | 76 | XmlRpcResponse response = new XmlRpcResponse(); |
76 | Hashtable requestData = (Hashtable)request.Params[0]; | 77 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -101,7 +102,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
101 | return response; | 102 | return response; |
102 | } | 103 | } |
103 | 104 | ||
104 | public XmlRpcResponse XmlRPCUpdateAvatarAppearance(XmlRpcRequest request) | 105 | public XmlRpcResponse XmlRPCUpdateAvatarAppearance(XmlRpcRequest request, IPEndPoint remoteClient) |
105 | { | 106 | { |
106 | XmlRpcResponse response = new XmlRpcResponse(); | 107 | XmlRpcResponse response = new XmlRpcResponse(); |
107 | Hashtable requestData = (Hashtable)request.Params[0]; | 108 | Hashtable requestData = (Hashtable)request.Params[0]; |
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs index 1684eb7..c860834 100644 --- a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs +++ b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.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 Nwc.XmlRpc; | 34 | using Nwc.XmlRpc; |
@@ -93,7 +94,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
93 | return response; | 94 | return response; |
94 | } | 95 | } |
95 | 96 | ||
96 | public XmlRpcResponse XmlRpcResponseXmlRPCAddUserFriend(XmlRpcRequest request) | 97 | public XmlRpcResponse XmlRpcResponseXmlRPCAddUserFriend(XmlRpcRequest request, IPEndPoint remoteClient) |
97 | { | 98 | { |
98 | XmlRpcResponse response = new XmlRpcResponse(); | 99 | XmlRpcResponse response = new XmlRpcResponse(); |
99 | Hashtable requestData = (Hashtable)request.Params[0]; | 100 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -115,7 +116,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
115 | return response; | 116 | return response; |
116 | } | 117 | } |
117 | 118 | ||
118 | public XmlRpcResponse XmlRpcResponseXmlRPCRemoveUserFriend(XmlRpcRequest request) | 119 | public XmlRpcResponse XmlRpcResponseXmlRPCRemoveUserFriend(XmlRpcRequest request, IPEndPoint remoteClient) |
119 | { | 120 | { |
120 | XmlRpcResponse response = new XmlRpcResponse(); | 121 | XmlRpcResponse response = new XmlRpcResponse(); |
121 | Hashtable requestData = (Hashtable)request.Params[0]; | 122 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -135,7 +136,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
135 | return response; | 136 | return response; |
136 | } | 137 | } |
137 | 138 | ||
138 | public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserFriendPerms(XmlRpcRequest request) | 139 | public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserFriendPerms(XmlRpcRequest request, IPEndPoint remoteClient) |
139 | { | 140 | { |
140 | XmlRpcResponse response = new XmlRpcResponse(); | 141 | XmlRpcResponse response = new XmlRpcResponse(); |
141 | Hashtable requestData = (Hashtable)request.Params[0]; | 142 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -156,7 +157,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
156 | return response; | 157 | return response; |
157 | } | 158 | } |
158 | 159 | ||
159 | public XmlRpcResponse XmlRpcResponseXmlRPCGetUserFriendList(XmlRpcRequest request) | 160 | public XmlRpcResponse XmlRpcResponseXmlRPCGetUserFriendList(XmlRpcRequest request, IPEndPoint remoteClient) |
160 | { | 161 | { |
161 | // XmlRpcResponse response = new XmlRpcResponse(); | 162 | // XmlRpcResponse response = new XmlRpcResponse(); |
162 | Hashtable requestData = (Hashtable)request.Params[0]; | 163 | Hashtable requestData = (Hashtable)request.Params[0]; |
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"]); |
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 | ||
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs index 5ebbd7b..61fac94 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.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.OptionalModules.Avatar.Chat | |||
135 | } | 136 | } |
136 | #endregion | 137 | #endregion |
137 | 138 | ||
138 | public static XmlRpcResponse XmlRpcAdminMethod(XmlRpcRequest request) | 139 | public static XmlRpcResponse XmlRpcAdminMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
139 | { | 140 | { |
140 | m_log.Info("[IRC-Bridge]: XML RPC Admin Entry"); | 141 | m_log.Info("[IRC-Bridge]: XML RPC Admin Entry"); |
141 | 142 | ||
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs index 687b2da..df3402d 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | |||
@@ -635,7 +635,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge | |||
635 | } | 635 | } |
636 | } | 636 | } |
637 | 637 | ||
638 | public XmlRpcResponse XmlRpcUpdateWelcomeMethod(XmlRpcRequest request) | 638 | public XmlRpcResponse XmlRpcUpdateWelcomeMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
639 | { | 639 | { |
640 | m_log.Info("[Concierge]: processing UpdateWelcome request"); | 640 | m_log.Info("[Concierge]: processing UpdateWelcome request"); |
641 | XmlRpcResponse response = new XmlRpcResponse(); | 641 | XmlRpcResponse response = new XmlRpcResponse(); |
diff --git a/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs index 62d8f4b..8462103 100644 --- a/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.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; |
@@ -419,7 +420,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule | |||
419 | /// <summary> | 420 | /// <summary> |
420 | /// XMLRPC handler to send alert message and sound to client | 421 | /// XMLRPC handler to send alert message and sound to client |
421 | /// </summary> | 422 | /// </summary> |
422 | public XmlRpcResponse UserAlert(XmlRpcRequest request) | 423 | public XmlRpcResponse UserAlert(XmlRpcRequest request, IPEndPoint remoteClient) |
423 | { | 424 | { |
424 | XmlRpcResponse ret = new XmlRpcResponse(); | 425 | XmlRpcResponse ret = new XmlRpcResponse(); |
425 | Hashtable retparam = new Hashtable(); | 426 | Hashtable retparam = new Hashtable(); |
@@ -469,7 +470,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule | |||
469 | 470 | ||
470 | # region Standalone box enablers only | 471 | # region Standalone box enablers only |
471 | 472 | ||
472 | public XmlRpcResponse quote_func(XmlRpcRequest request) | 473 | public XmlRpcResponse quote_func(XmlRpcRequest request, IPEndPoint remoteClient) |
473 | { | 474 | { |
474 | // Hashtable requestData = (Hashtable) request.Params[0]; | 475 | // Hashtable requestData = (Hashtable) request.Params[0]; |
475 | // UUID agentId = UUID.Zero; | 476 | // UUID agentId = UUID.Zero; |
@@ -493,7 +494,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule | |||
493 | 494 | ||
494 | } | 495 | } |
495 | 496 | ||
496 | public XmlRpcResponse buy_func(XmlRpcRequest request) | 497 | public XmlRpcResponse buy_func(XmlRpcRequest request, IPEndPoint remoteClient) |
497 | { | 498 | { |
498 | // Hashtable requestData = (Hashtable) request.Params[0]; | 499 | // Hashtable requestData = (Hashtable) request.Params[0]; |
499 | // UUID agentId = UUID.Zero; | 500 | // UUID agentId = UUID.Zero; |
@@ -506,7 +507,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule | |||
506 | return returnval; | 507 | return returnval; |
507 | } | 508 | } |
508 | 509 | ||
509 | public XmlRpcResponse preflightBuyLandPrep_func(XmlRpcRequest request) | 510 | public XmlRpcResponse preflightBuyLandPrep_func(XmlRpcRequest request, IPEndPoint remoteClient) |
510 | { | 511 | { |
511 | XmlRpcResponse ret = new XmlRpcResponse(); | 512 | XmlRpcResponse ret = new XmlRpcResponse(); |
512 | Hashtable retparam = new Hashtable(); | 513 | Hashtable retparam = new Hashtable(); |
@@ -541,7 +542,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule | |||
541 | return ret; | 542 | return ret; |
542 | } | 543 | } |
543 | 544 | ||
544 | public XmlRpcResponse landBuy_func(XmlRpcRequest request) | 545 | public XmlRpcResponse landBuy_func(XmlRpcRequest request, IPEndPoint remoteClient) |
545 | { | 546 | { |
546 | XmlRpcResponse ret = new XmlRpcResponse(); | 547 | XmlRpcResponse ret = new XmlRpcResponse(); |
547 | Hashtable retparam = new Hashtable(); | 548 | Hashtable retparam = new Hashtable(); |