* Rex merge, Application Plugins
parent
b8b18356e6
commit
e345798413
|
@ -1,106 +1,108 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using Mono.Addins;
|
using Mono.Addins;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Framework.Console;
|
using OpenSim.Framework.Console;
|
||||||
using OpenSim.Framework.RegionLoader.Filesystem;
|
using OpenSim.Framework.RegionLoader.Filesystem;
|
||||||
using OpenSim.Framework.RegionLoader.Web;
|
using OpenSim.Framework.RegionLoader.Web;
|
||||||
|
|
||||||
[assembly : Addin]
|
[assembly : Addin]
|
||||||
[assembly : AddinDependency("OpenSim", "0.4")]
|
[assembly : AddinDependency("OpenSim", "0.5")]
|
||||||
|
|
||||||
namespace OpenSim.ApplicationPlugins.LoadRegions
|
namespace OpenSim.ApplicationPlugins.LoadRegions
|
||||||
{
|
{
|
||||||
[Extension("/OpenSim/Startup")]
|
[Extension("/OpenSim/Startup")]
|
||||||
public class LoadRegionsPlugin : IApplicationPlugin
|
public class LoadRegionsPlugin : IApplicationPlugin
|
||||||
{
|
{
|
||||||
public void Initialise(OpenSimMain openSim)
|
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
{
|
|
||||||
MainLog.Instance.Notice("LOADREGIONS", "Load Regions addin being initialised");
|
public void Initialise(OpenSimMain openSim)
|
||||||
|
{
|
||||||
IRegionLoader regionLoader;
|
m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
|
||||||
if (openSim.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
|
|
||||||
{
|
IRegionLoader regionLoader;
|
||||||
MainLog.Instance.Notice("LOADREGIONS", "Loading Region Info from filesystem");
|
if (openSim.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
|
||||||
regionLoader = new RegionLoaderFileSystem();
|
{
|
||||||
}
|
m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem");
|
||||||
else
|
regionLoader = new RegionLoaderFileSystem();
|
||||||
{
|
}
|
||||||
MainLog.Instance.Notice("LOADREGIONSPLUGIN", "Loading Region Info from web");
|
else
|
||||||
regionLoader = new RegionLoaderWebServer();
|
{
|
||||||
}
|
m_log.Info("[LOADREGIONSPLUGIN]: Loading Region Info from web");
|
||||||
|
regionLoader = new RegionLoaderWebServer();
|
||||||
regionLoader.SetIniConfigSource(openSim.ConfigSource);
|
}
|
||||||
RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
|
|
||||||
|
regionLoader.SetIniConfigSource(openSim.ConfigSource);
|
||||||
openSim.ModuleLoader.LoadDefaultSharedModules();
|
RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
|
||||||
|
|
||||||
for (int i = 0; i < regionsToLoad.Length; i++)
|
openSim.ModuleLoader.LoadDefaultSharedModules();
|
||||||
{
|
|
||||||
MainLog.Instance.Debug("LOADREGIONS", "Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")");
|
for (int i = 0; i < regionsToLoad.Length; i++)
|
||||||
openSim.CreateRegion(regionsToLoad[i]);
|
{
|
||||||
}
|
m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")");
|
||||||
|
openSim.CreateRegion(regionsToLoad[i]);
|
||||||
openSim.ModuleLoader.PostInitialise();
|
}
|
||||||
openSim.ModuleLoader.ClearCache();
|
|
||||||
}
|
openSim.ModuleLoader.PostInitialise();
|
||||||
|
openSim.ModuleLoader.ClearCache();
|
||||||
public void LoadRegionFromConfig(OpenSimMain openSim, ulong regionhandle)
|
}
|
||||||
{
|
|
||||||
MainLog.Instance.Notice("LOADREGIONS", "Load Regions addin being initialised");
|
public void LoadRegionFromConfig(OpenSimMain openSim, ulong regionhandle)
|
||||||
|
{
|
||||||
IRegionLoader regionLoader;
|
m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
|
||||||
if (openSim.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
|
|
||||||
{
|
IRegionLoader regionLoader;
|
||||||
MainLog.Instance.Notice("LOADREGIONS", "Loading Region Info from filesystem");
|
if (openSim.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
|
||||||
regionLoader = new RegionLoaderFileSystem();
|
{
|
||||||
}
|
m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem");
|
||||||
else
|
regionLoader = new RegionLoaderFileSystem();
|
||||||
{
|
}
|
||||||
MainLog.Instance.Notice("LOADREGIONS", "Loading Region Info from web");
|
else
|
||||||
regionLoader = new RegionLoaderWebServer();
|
{
|
||||||
}
|
m_log.Info("[LOADREGIONS]: Loading Region Info from web");
|
||||||
|
regionLoader = new RegionLoaderWebServer();
|
||||||
regionLoader.SetIniConfigSource(openSim.ConfigSource);
|
}
|
||||||
RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
|
|
||||||
for (int i = 0; i < regionsToLoad.Length; i++)
|
regionLoader.SetIniConfigSource(openSim.ConfigSource);
|
||||||
{
|
RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
|
||||||
if (regionhandle == regionsToLoad[i].RegionHandle)
|
for (int i = 0; i < regionsToLoad.Length; i++)
|
||||||
{
|
{
|
||||||
MainLog.Instance.Debug("LOADREGIONS", "Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")");
|
if (regionhandle == regionsToLoad[i].RegionHandle)
|
||||||
openSim.CreateRegion(regionsToLoad[i]);
|
{
|
||||||
}
|
m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")");
|
||||||
}
|
openSim.CreateRegion(regionsToLoad[i]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public void Close()
|
}
|
||||||
{
|
|
||||||
}
|
public void Close()
|
||||||
}
|
{
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -1,39 +1,67 @@
|
||||||
using System.Reflection;
|
/*
|
||||||
using System.Runtime.InteropServices;
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
// General Information about an assembly is controlled through the following
|
*
|
||||||
// set of attributes. Change these attribute values to modify the information
|
* Redistribution and use in source and binary forms, with or without
|
||||||
// associated with an assembly.
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
[assembly : AssemblyTitle("OpenSim.Addin")]
|
* notice, this list of conditions and the following disclaimer.
|
||||||
[assembly : AssemblyDescription("")]
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
[assembly : AssemblyConfiguration("")]
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
[assembly : AssemblyCompany("")]
|
* documentation and/or other materials provided with the distribution.
|
||||||
[assembly : AssemblyProduct("OpenSim.Addin")]
|
* * Neither the name of the OpenSim Project nor the
|
||||||
[assembly : AssemblyCopyright("Copyright © 2007")]
|
* names of its contributors may be used to endorse or promote products
|
||||||
[assembly : AssemblyTrademark("")]
|
* derived from this software without specific prior written permission.
|
||||||
[assembly : AssemblyCulture("")]
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
// Setting ComVisible to false makes the types in this assembly not visible
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
// to COM components. If you need to access a type in this assembly from
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
// COM, set the ComVisible attribute to true on that type.
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
[assembly : ComVisible(false)]
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
[assembly : Guid("45b979d9-d8d4-42fd-9780-fe9ac7e86cb4")]
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*
|
||||||
// Version information for an assembly consists of the following four values:
|
*/
|
||||||
//
|
|
||||||
// Major Version
|
using System.Reflection;
|
||||||
// Minor Version
|
using System.Runtime.InteropServices;
|
||||||
// Build Number
|
|
||||||
// Revision
|
// General Information about an assembly is controlled through the following
|
||||||
//
|
// set of attributes. Change these attribute values to modify the information
|
||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// associated with an assembly.
|
||||||
// by using the '*' as shown below:
|
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
[assembly : AssemblyTitle("OpenSim.Addin")]
|
||||||
|
[assembly : AssemblyDescription("")]
|
||||||
[assembly : AssemblyVersion("1.0.0.0")]
|
[assembly : AssemblyConfiguration("")]
|
||||||
[assembly : AssemblyFileVersion("1.0.0.0")]
|
[assembly : AssemblyCompany("")]
|
||||||
|
[assembly : AssemblyProduct("OpenSim.Addin")]
|
||||||
|
[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
|
||||||
|
[assembly : AssemblyTrademark("")]
|
||||||
|
[assembly : AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
|
||||||
|
[assembly : ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
|
||||||
|
[assembly : Guid("45b979d9-d8d4-42fd-9780-fe9ac7e86cb4")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
|
// by using the '*' as shown below:
|
||||||
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
|
|
||||||
|
[assembly : AssemblyVersion("1.0.0.0")]
|
||||||
|
[assembly : AssemblyFileVersion("1.0.0.0")]
|
||||||
|
|
|
@ -1,250 +1,391 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Timers;
|
using System.Timers;
|
||||||
using libsecondlife;
|
using libsecondlife;
|
||||||
using Mono.Addins;
|
using Mono.Addins;
|
||||||
using Nwc.XmlRpc;
|
using Nwc.XmlRpc;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Framework.Console;
|
using OpenSim.Framework.Console;
|
||||||
using OpenSim.Framework.Servers;
|
using OpenSim.Framework.Servers;
|
||||||
using OpenSim.Region.Environment.Scenes;
|
using OpenSim.Region.Environment.Scenes;
|
||||||
|
|
||||||
[assembly : Addin]
|
[assembly : Addin]
|
||||||
[assembly : AddinDependency("OpenSim", "0.4")]
|
[assembly : AddinDependency("OpenSim", "0.5")]
|
||||||
|
|
||||||
namespace OpenSim.ApplicationPlugins.LoadRegions
|
namespace OpenSim.ApplicationPlugins.LoadRegions
|
||||||
{
|
{
|
||||||
[Extension("/OpenSim/Startup")]
|
[Extension("/OpenSim/Startup")]
|
||||||
public class RemoteAdminPlugin : IApplicationPlugin
|
public class RemoteAdminPlugin : IApplicationPlugin
|
||||||
{
|
{
|
||||||
private OpenSimMain m_app;
|
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
private BaseHttpServer m_httpd;
|
|
||||||
private string requiredPassword = "";
|
private OpenSimMain m_app;
|
||||||
|
private BaseHttpServer m_httpd;
|
||||||
public void Initialise(OpenSimMain openSim)
|
private string requiredPassword = String.Empty;
|
||||||
{
|
|
||||||
try
|
public void Initialise(OpenSimMain openSim)
|
||||||
{
|
{
|
||||||
if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false))
|
try
|
||||||
{
|
{
|
||||||
MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled");
|
if (openSim.ConfigSource.Configs["RemoteAdmin"] != null && openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false))
|
||||||
requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", "");
|
{
|
||||||
|
m_log.Info("[RADMIN]: Remote Admin Plugin Enabled");
|
||||||
m_app = openSim;
|
requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", String.Empty);
|
||||||
m_httpd = openSim.HttpServer;
|
|
||||||
|
m_app = openSim;
|
||||||
m_httpd.AddXmlRPCHandler("admin_create_region", XmlRpcCreateRegionMethod);
|
m_httpd = openSim.HttpServer;
|
||||||
m_httpd.AddXmlRPCHandler("admin_shutdown", XmlRpcShutdownMethod);
|
|
||||||
m_httpd.AddXmlRPCHandler("admin_broadcast", XmlRpcAlertMethod);
|
m_httpd.AddXmlRPCHandler("admin_create_region", XmlRpcCreateRegionMethod);
|
||||||
m_httpd.AddXmlRPCHandler("admin_restart", XmlRpcRestartMethod);
|
m_httpd.AddXmlRPCHandler("admin_shutdown", XmlRpcShutdownMethod);
|
||||||
}
|
m_httpd.AddXmlRPCHandler("admin_broadcast", XmlRpcAlertMethod);
|
||||||
}
|
m_httpd.AddXmlRPCHandler("admin_restart", XmlRpcRestartMethod);
|
||||||
catch (NullReferenceException)
|
m_httpd.AddXmlRPCHandler("admin_load_heightmap", XmlRpcLoadHeightmapMethod);
|
||||||
{
|
m_httpd.AddXmlRPCHandler("admin_create_user", XmlRpcCreateUserMethod);
|
||||||
// Ignore.
|
m_httpd.AddXmlRPCHandler("admin_load_xml", XmlRpcLoadXMLMethod);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (NullReferenceException)
|
||||||
public XmlRpcResponse XmlRpcRestartMethod(XmlRpcRequest request)
|
{
|
||||||
{
|
// Ignore.
|
||||||
XmlRpcResponse response = new XmlRpcResponse();
|
}
|
||||||
Hashtable requestData = (Hashtable) request.Params[0];
|
}
|
||||||
|
|
||||||
LLUUID regionID = new LLUUID((string) requestData["regionID"]);
|
public XmlRpcResponse XmlRpcRestartMethod(XmlRpcRequest request)
|
||||||
|
{
|
||||||
Hashtable responseData = new Hashtable();
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
if (requiredPassword != "" &&
|
Hashtable requestData = (Hashtable) request.Params[0];
|
||||||
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
|
|
||||||
{
|
LLUUID regionID = new LLUUID((string) requestData["regionID"]);
|
||||||
responseData["accepted"] = "false";
|
|
||||||
response.Value = responseData;
|
Hashtable responseData = new Hashtable();
|
||||||
}
|
if (requiredPassword != String.Empty &&
|
||||||
else
|
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
|
||||||
{
|
{
|
||||||
responseData["accepted"] = "true";
|
responseData["accepted"] = "false";
|
||||||
response.Value = responseData;
|
response.Value = responseData;
|
||||||
|
}
|
||||||
Scene RebootedScene;
|
else
|
||||||
|
{
|
||||||
if (m_app.SceneManager.TryGetScene(regionID, out RebootedScene))
|
responseData["accepted"] = "true";
|
||||||
{
|
response.Value = responseData;
|
||||||
responseData["rebooting"] = "true";
|
|
||||||
RebootedScene.Restart(30);
|
Scene RebootedScene;
|
||||||
}
|
|
||||||
else
|
if (m_app.SceneManager.TryGetScene(regionID, out RebootedScene))
|
||||||
{
|
{
|
||||||
responseData["rebooting"] = "false";
|
responseData["rebooting"] = "true";
|
||||||
}
|
RebootedScene.Restart(30);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
return response;
|
{
|
||||||
}
|
responseData["rebooting"] = "false";
|
||||||
|
}
|
||||||
public XmlRpcResponse XmlRpcAlertMethod(XmlRpcRequest request)
|
}
|
||||||
{
|
|
||||||
XmlRpcResponse response = new XmlRpcResponse();
|
return response;
|
||||||
Hashtable requestData = (Hashtable) request.Params[0];
|
}
|
||||||
|
|
||||||
Hashtable responseData = new Hashtable();
|
public XmlRpcResponse XmlRpcAlertMethod(XmlRpcRequest request)
|
||||||
if (requiredPassword != "" &&
|
{
|
||||||
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
{
|
Hashtable requestData = (Hashtable) request.Params[0];
|
||||||
responseData["accepted"] = "false";
|
|
||||||
response.Value = responseData;
|
Hashtable responseData = new Hashtable();
|
||||||
}
|
if (requiredPassword != String.Empty &&
|
||||||
else
|
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
|
||||||
{
|
{
|
||||||
string message = (string) requestData["message"];
|
responseData["accepted"] = "false";
|
||||||
MainLog.Instance.Verbose("RADMIN", "Broadcasting: " + message);
|
response.Value = responseData;
|
||||||
|
}
|
||||||
responseData["accepted"] = "true";
|
else
|
||||||
response.Value = responseData;
|
{
|
||||||
|
string message = (string) requestData["message"];
|
||||||
m_app.SceneManager.SendGeneralMessage(message);
|
m_log.Info("[RADMIN]: Broadcasting: " + message);
|
||||||
}
|
|
||||||
|
responseData["accepted"] = "true";
|
||||||
return response;
|
response.Value = responseData;
|
||||||
}
|
|
||||||
|
m_app.SceneManager.SendGeneralMessage(message);
|
||||||
public XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request)
|
}
|
||||||
{
|
|
||||||
MainLog.Instance.Verbose("RADMIN", "Received Shutdown Administrator Request");
|
return response;
|
||||||
XmlRpcResponse response = new XmlRpcResponse();
|
}
|
||||||
Hashtable requestData = (Hashtable) request.Params[0];
|
|
||||||
Hashtable responseData = new Hashtable();
|
public XmlRpcResponse XmlRpcLoadHeightmapMethod(XmlRpcRequest request)
|
||||||
if (requiredPassword != "" &&
|
{
|
||||||
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
{
|
Hashtable requestData = (Hashtable)request.Params[0];
|
||||||
responseData["accepted"] = "false";
|
|
||||||
response.Value = responseData;
|
Hashtable responseData = new Hashtable();
|
||||||
}
|
if (requiredPassword != String.Empty &&
|
||||||
else
|
(!requestData.Contains("password") || (string)requestData["password"] != requiredPassword))
|
||||||
{
|
{
|
||||||
if ((string) requestData["shutdown"] == "delayed")
|
responseData["accepted"] = "false";
|
||||||
{
|
response.Value = responseData;
|
||||||
int timeout = (Int32) requestData["milliseconds"];
|
}
|
||||||
|
else
|
||||||
responseData["accepted"] = "true";
|
{
|
||||||
response.Value = responseData;
|
string file = (string)requestData["filename"];
|
||||||
|
LLUUID regionID = LLUUID.Parse((string)requestData["regionid"]);
|
||||||
m_app.SceneManager.SendGeneralMessage("Region is going down in " + ((int) (timeout/1000)).ToString() +
|
m_log.Info("[RADMIN]: Terrain Loading: " + file);
|
||||||
" second(s). Please save what you are doing and log out.");
|
|
||||||
|
responseData["accepted"] = "true";
|
||||||
// Perform shutdown
|
|
||||||
Timer shutdownTimer = new Timer(timeout); // Wait before firing
|
Scene region = null;
|
||||||
shutdownTimer.AutoReset = false;
|
|
||||||
shutdownTimer.Elapsed += new ElapsedEventHandler(shutdownTimer_Elapsed);
|
if (m_app.SceneManager.TryGetScene(regionID, out region))
|
||||||
shutdownTimer.Start();
|
{
|
||||||
|
region.LoadWorldMap(file);
|
||||||
return response;
|
responseData["success"] = "true";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
responseData["accepted"] = "true";
|
responseData["success"] = "false";
|
||||||
response.Value = responseData;
|
responseData["error"] = "1: Unable to get a scene with that name.";
|
||||||
|
}
|
||||||
m_app.SceneManager.SendGeneralMessage("Region is going down now.");
|
response.Value = responseData;
|
||||||
|
}
|
||||||
// Perform shutdown
|
|
||||||
Timer shutdownTimer = new Timer(2000); // Wait 2 seconds before firing
|
return response;
|
||||||
shutdownTimer.AutoReset = false;
|
}
|
||||||
shutdownTimer.Elapsed += new ElapsedEventHandler(shutdownTimer_Elapsed);
|
|
||||||
shutdownTimer.Start();
|
public XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request)
|
||||||
|
{
|
||||||
return response;
|
m_log.Info("[RADMIN]: Received Shutdown Administrator Request");
|
||||||
}
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
}
|
Hashtable requestData = (Hashtable) request.Params[0];
|
||||||
return response;
|
Hashtable responseData = new Hashtable();
|
||||||
}
|
if (requiredPassword != String.Empty &&
|
||||||
|
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
|
||||||
private void shutdownTimer_Elapsed(object sender, ElapsedEventArgs e)
|
{
|
||||||
{
|
responseData["accepted"] = "false";
|
||||||
m_app.Shutdown();
|
response.Value = responseData;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
public XmlRpcResponse XmlRpcCreateRegionMethod(XmlRpcRequest request)
|
{
|
||||||
{
|
if ((string) requestData["shutdown"] == "delayed")
|
||||||
MainLog.Instance.Verbose("RADMIN", "Received Create Region Administrator Request");
|
{
|
||||||
XmlRpcResponse response = new XmlRpcResponse();
|
int timeout = (Int32) requestData["milliseconds"];
|
||||||
Hashtable requestData = (Hashtable) request.Params[0];
|
|
||||||
Hashtable responseData = new Hashtable();
|
responseData["accepted"] = "true";
|
||||||
if (requiredPassword != "" &&
|
response.Value = responseData;
|
||||||
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
|
|
||||||
{
|
m_app.SceneManager.SendGeneralMessage("Region is going down in " + ((int) (timeout/1000)).ToString() +
|
||||||
responseData["created"] = "false";
|
" second(s). Please save what you are doing and log out.");
|
||||||
response.Value = responseData;
|
|
||||||
}
|
// Perform shutdown
|
||||||
else
|
Timer shutdownTimer = new Timer(timeout); // Wait before firing
|
||||||
{
|
shutdownTimer.AutoReset = false;
|
||||||
RegionInfo newRegionData = new RegionInfo();
|
shutdownTimer.Elapsed += new ElapsedEventHandler(shutdownTimer_Elapsed);
|
||||||
|
shutdownTimer.Start();
|
||||||
try
|
|
||||||
{
|
return response;
|
||||||
newRegionData.RegionID = (string) requestData["region_id"];
|
}
|
||||||
newRegionData.RegionName = (string) requestData["region_name"];
|
else
|
||||||
newRegionData.RegionLocX = Convert.ToUInt32((Int32) requestData["region_x"]);
|
{
|
||||||
newRegionData.RegionLocY = Convert.ToUInt32((Int32) requestData["region_y"]);
|
responseData["accepted"] = "true";
|
||||||
|
response.Value = responseData;
|
||||||
// Security risk
|
|
||||||
newRegionData.DataStore = (string) requestData["datastore"];
|
m_app.SceneManager.SendGeneralMessage("Region is going down now.");
|
||||||
|
|
||||||
newRegionData.InternalEndPoint = new IPEndPoint(
|
// Perform shutdown
|
||||||
IPAddress.Parse((string) requestData["listen_ip"]), 0);
|
Timer shutdownTimer = new Timer(2000); // Wait 2 seconds before firing
|
||||||
|
shutdownTimer.AutoReset = false;
|
||||||
newRegionData.InternalEndPoint.Port = (Int32) requestData["listen_port"];
|
shutdownTimer.Elapsed += new ElapsedEventHandler(shutdownTimer_Elapsed);
|
||||||
newRegionData.ExternalHostName = (string) requestData["external_address"];
|
shutdownTimer.Start();
|
||||||
|
|
||||||
newRegionData.MasterAvatarFirstName = (string) requestData["region_master_first"];
|
return response;
|
||||||
newRegionData.MasterAvatarLastName = (string) requestData["region_master_last"];
|
}
|
||||||
|
}
|
||||||
m_app.CreateRegion(newRegionData);
|
return response;
|
||||||
|
}
|
||||||
responseData["created"] = "true";
|
|
||||||
response.Value = responseData;
|
private void shutdownTimer_Elapsed(object sender, ElapsedEventArgs e)
|
||||||
}
|
{
|
||||||
catch (Exception e)
|
m_app.Shutdown();
|
||||||
{
|
}
|
||||||
responseData["created"] = "false";
|
|
||||||
responseData["error"] = e.ToString();
|
public XmlRpcResponse XmlRpcCreateRegionMethod(XmlRpcRequest request)
|
||||||
response.Value = responseData;
|
{
|
||||||
}
|
m_log.Info("[RADMIN]: Received Create Region Administrator Request");
|
||||||
}
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
|
Hashtable requestData = (Hashtable) request.Params[0];
|
||||||
return response;
|
Hashtable responseData = new Hashtable();
|
||||||
}
|
if (requiredPassword != System.String.Empty &&
|
||||||
|
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
|
||||||
public void Close()
|
{
|
||||||
{
|
responseData["created"] = "false";
|
||||||
}
|
response.Value = responseData;
|
||||||
|
}
|
||||||
}
|
else
|
||||||
}
|
{
|
||||||
|
RegionInfo newRegionData = new RegionInfo();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
newRegionData.RegionID = (string) requestData["region_id"];
|
||||||
|
newRegionData.RegionName = (string) requestData["region_name"];
|
||||||
|
newRegionData.RegionLocX = Convert.ToUInt32((Int32) requestData["region_x"]);
|
||||||
|
newRegionData.RegionLocY = Convert.ToUInt32((Int32) requestData["region_y"]);
|
||||||
|
|
||||||
|
// Security risk
|
||||||
|
newRegionData.DataStore = (string) requestData["datastore"];
|
||||||
|
|
||||||
|
newRegionData.InternalEndPoint = new IPEndPoint(
|
||||||
|
IPAddress.Parse((string) requestData["listen_ip"]), 0);
|
||||||
|
|
||||||
|
newRegionData.InternalEndPoint.Port = (Int32) requestData["listen_port"];
|
||||||
|
newRegionData.ExternalHostName = (string) requestData["external_address"];
|
||||||
|
|
||||||
|
newRegionData.MasterAvatarFirstName = (string) requestData["region_master_first"];
|
||||||
|
newRegionData.MasterAvatarLastName = (string) requestData["region_master_last"];
|
||||||
|
|
||||||
|
m_app.CreateRegion(newRegionData);
|
||||||
|
|
||||||
|
responseData["created"] = "true";
|
||||||
|
response.Value = responseData;
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
responseData["created"] = "false";
|
||||||
|
responseData["error"] = e.ToString();
|
||||||
|
response.Value = responseData;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
public XmlRpcResponse XmlRpcCreateUserMethod(XmlRpcRequest request)
|
||||||
|
{
|
||||||
|
m_log.Info("[RADMIN]: Received Create User Administrator Request");
|
||||||
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
|
Hashtable requestData = (Hashtable) request.Params[0];
|
||||||
|
Hashtable responseData = new Hashtable();
|
||||||
|
if (requiredPassword != System.String.Empty &&
|
||||||
|
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
|
||||||
|
{
|
||||||
|
responseData["created"] = "false";
|
||||||
|
response.Value = responseData;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string tempfirstname = (string) requestData["user_firstname"];
|
||||||
|
string templastname = (string) requestData["user_lastname"];
|
||||||
|
string tempPasswd = (string) requestData["user_password"];
|
||||||
|
uint regX = Convert.ToUInt32((Int32) requestData["start_region_x"]);
|
||||||
|
uint regY = Convert.ToUInt32((Int32) requestData["start_region_y"]);
|
||||||
|
|
||||||
|
LLUUID tempuserID = m_app.CreateUser(tempfirstname, templastname, tempPasswd, regX, regY);
|
||||||
|
|
||||||
|
if (tempuserID == LLUUID.Zero)
|
||||||
|
{
|
||||||
|
responseData["created"] = "false";
|
||||||
|
responseData["error"] = "Error creating user";
|
||||||
|
responseData["avatar_uuid"] = LLUUID.Zero;
|
||||||
|
response.Value = responseData;
|
||||||
|
m_log.Error("[RADMIN]: Error creating user (" + tempfirstname + " " + templastname + ") :");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
responseData["created"] = "true";
|
||||||
|
responseData["avatar_uuid"] = tempuserID;
|
||||||
|
response.Value = responseData;
|
||||||
|
m_log.Info("[RADMIN]: User " + tempfirstname + " " + templastname + " created. Userid " + tempuserID + " assigned.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
responseData["created"] = "false";
|
||||||
|
responseData["error"] = e.ToString();
|
||||||
|
responseData["avatar_uuid"] = LLUUID.Zero;
|
||||||
|
response.Value = responseData;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
public XmlRpcResponse XmlRpcLoadXMLMethod(XmlRpcRequest request)
|
||||||
|
{
|
||||||
|
m_log.Info("[RADMIN]: Received Load XML Administrator Request");
|
||||||
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
|
Hashtable requestData = (Hashtable) request.Params[0];
|
||||||
|
Hashtable responseData = new Hashtable();
|
||||||
|
if (requiredPassword != System.String.Empty &&
|
||||||
|
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
|
||||||
|
{
|
||||||
|
responseData["loaded"] = "false";
|
||||||
|
responseData["switched"] = "false";
|
||||||
|
response.Value = responseData;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string region_name = (string) requestData["region_name"];
|
||||||
|
string filename = (string) requestData["filename"];
|
||||||
|
|
||||||
|
if (m_app.SceneManager.TrySetCurrentScene(region_name))
|
||||||
|
{
|
||||||
|
m_log.Info("[RADMIN] Switched to region "+region_name);
|
||||||
|
responseData["switched"] = "true";
|
||||||
|
m_app.SceneManager.LoadCurrentSceneFromXml(filename, true, new LLVector3(0, 0, 0));
|
||||||
|
responseData["loaded"] = "true";
|
||||||
|
response.Value = responseData;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Info("[RADMIN] Failed to switch to region "+region_name);
|
||||||
|
responseData["loaded"] = "false";
|
||||||
|
responseData["switched"] = "false";
|
||||||
|
response.Value = responseData;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
responseData["loaded"] = "false";
|
||||||
|
responseData["error"] = e.ToString();
|
||||||
|
response.Value = responseData;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Close()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue