aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
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/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
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 '')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs40
1 files changed, 20 insertions, 20 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");