OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties.

0.6.6-post-fixes
Jeff Ames 2009-06-14 21:37:50 +00:00
parent 6abffedab5
commit 8d0eb3307f
12 changed files with 1316 additions and 1316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

270
OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
View File

@ -1,135 +1,135 @@
/* /*
* 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 OpenSimulator Project nor the * * Neither the name of the OpenSimulator 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 log4net; using log4net;
using Nini.Config; using Nini.Config;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Server.Base; using OpenSim.Server.Base;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
{ {
public class LocalNeighbourServicesConnector : public class LocalNeighbourServicesConnector :
ISharedRegionModule, INeighbourService ISharedRegionModule, INeighbourService
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger( LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType); MethodBase.GetCurrentMethod().DeclaringType);
private List<Scene> m_Scenes = new List<Scene>(); private List<Scene> m_Scenes = new List<Scene>();
private bool m_Enabled = false; private bool m_Enabled = false;
public LocalNeighbourServicesConnector() public LocalNeighbourServicesConnector()
{ {
} }
public LocalNeighbourServicesConnector(List<Scene> scenes) public LocalNeighbourServicesConnector(List<Scene> scenes)
{ {
m_Scenes = scenes; m_Scenes = scenes;
} }
#region ISharedRegionModule #region ISharedRegionModule
public string Name public string Name
{ {
get { return "LocalNeighbourServicesConnector"; } get { return "LocalNeighbourServicesConnector"; }
} }
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
{ {
IConfig moduleConfig = source.Configs["Modules"]; IConfig moduleConfig = source.Configs["Modules"];
if (moduleConfig != null) if (moduleConfig != null)
{ {
string name = moduleConfig.GetString("NeighbourServices", this.Name); string name = moduleConfig.GetString("NeighbourServices", this.Name);
if (name == Name) if (name == Name)
{ {
// m_Enabled rules whether this module registers as INeighbourService or not // m_Enabled rules whether this module registers as INeighbourService or not
m_Enabled = true; m_Enabled = true;
m_log.Info("[NEIGHBOUR CONNECTOR]: Local neighbour connector enabled"); m_log.Info("[NEIGHBOUR CONNECTOR]: Local neighbour connector enabled");
} }
} }
} }
public void Close() public void Close()
{ {
} }
public void AddRegion(Scene scene) public void AddRegion(Scene scene)
{ {
m_Scenes.Add(scene); m_Scenes.Add(scene);
if (!m_Enabled) if (!m_Enabled)
return; return;
scene.RegisterModuleInterface<INeighbourService>(this); scene.RegisterModuleInterface<INeighbourService>(this);
} }
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)
{ {
m_log.Info("[NEIGHBOUR CONNECTOR]: Local neighbour connector enabled for region " + scene.RegionInfo.RegionName); m_log.Info("[NEIGHBOUR CONNECTOR]: Local neighbour connector enabled for region " + scene.RegionInfo.RegionName);
} }
public void PostInitialise() public void PostInitialise()
{ {
} }
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
{ {
// Always remove // Always remove
if (m_Scenes.Contains(scene)) if (m_Scenes.Contains(scene))
m_Scenes.Remove(scene); m_Scenes.Remove(scene);
} }
#endregion ISharedRegionModule #endregion ISharedRegionModule
#region INeighbourService #region INeighbourService
public bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) public bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
{ {
m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}", m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}",
thisRegion.RegionName, regionHandle, m_Scenes.Count); thisRegion.RegionName, regionHandle, m_Scenes.Count);
foreach (Scene s in m_Scenes) foreach (Scene s in m_Scenes)
{ {
if (s.RegionInfo.RegionHandle == regionHandle) if (s.RegionInfo.RegionHandle == regionHandle)
{ {
m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour"); m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour");
return s.IncomingHelloNeighbour(thisRegion); return s.IncomingHelloNeighbour(thisRegion);
} }
} }
m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: region handle {0} not found", regionHandle); m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: region handle {0} not found", regionHandle);
return false; return false;
} }
#endregion INeighbourService #endregion INeighbourService
} }
} }

296
OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
View File

@ -1,148 +1,148 @@
/* /*
* 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 OpenSimulator Project nor the * * Neither the name of the OpenSimulator 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 log4net; using log4net;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Services.Connectors; using OpenSim.Services.Connectors;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using OpenSim.Server.Base; using OpenSim.Server.Base;
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
{ {
public class RemoteNeighbourServicesConnector : public class RemoteNeighbourServicesConnector :
NeighbourServicesConnector, ISharedRegionModule, INeighbourService NeighbourServicesConnector, ISharedRegionModule, INeighbourService
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger( LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType); MethodBase.GetCurrentMethod().DeclaringType);
private bool m_Enabled = false; private bool m_Enabled = false;
private LocalNeighbourServicesConnector m_LocalService; private LocalNeighbourServicesConnector m_LocalService;
private string serviceDll; private string serviceDll;
private List<Scene> m_Scenes = new List<Scene>(); private List<Scene> m_Scenes = new List<Scene>();
public string Name public string Name
{ {
get { return "RemoteNeighbourServicesConnector"; } get { return "RemoteNeighbourServicesConnector"; }
} }
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
{ {
IConfig moduleConfig = source.Configs["Modules"]; IConfig moduleConfig = source.Configs["Modules"];
if (moduleConfig != null) if (moduleConfig != null)
{ {
string name = moduleConfig.GetString("NeighbourServices"); string name = moduleConfig.GetString("NeighbourServices");
if (name == Name) if (name == Name)
{ {
m_LocalService = new LocalNeighbourServicesConnector(); m_LocalService = new LocalNeighbourServicesConnector();
//IConfig neighbourConfig = source.Configs["NeighbourService"]; //IConfig neighbourConfig = source.Configs["NeighbourService"];
//if (neighbourConfig == null) //if (neighbourConfig == null)
//{ //{
// m_log.Error("[NEIGHBOUR CONNECTOR]: NeighbourService missing from OpenSim.ini"); // m_log.Error("[NEIGHBOUR CONNECTOR]: NeighbourService missing from OpenSim.ini");
// return; // return;
//} //}
//serviceDll = neighbourConfig.GetString("LocalServiceModule", String.Empty); //serviceDll = neighbourConfig.GetString("LocalServiceModule", String.Empty);
//if (serviceDll == String.Empty) //if (serviceDll == String.Empty)
//{ //{
// m_log.Error("[NEIGHBOUR CONNECTOR]: No LocalServiceModule named in section NeighbourService"); // m_log.Error("[NEIGHBOUR CONNECTOR]: No LocalServiceModule named in section NeighbourService");
// return; // return;
//} //}
m_Enabled = true; m_Enabled = true;
m_log.Info("[NEIGHBOUR CONNECTOR]: Remote Neighbour connector enabled"); m_log.Info("[NEIGHBOUR CONNECTOR]: Remote Neighbour connector enabled");
} }
} }
} }
public void PostInitialise() public void PostInitialise()
{ {
//if (m_Enabled) //if (m_Enabled)
//{ //{
// Object[] args = new Object[] { m_Scenes }; // Object[] args = new Object[] { m_Scenes };
// m_LocalService = // m_LocalService =
// ServerUtils.LoadPlugin<INeighbourService>(serviceDll, // ServerUtils.LoadPlugin<INeighbourService>(serviceDll,
// args); // args);
// if (m_LocalService == null) // if (m_LocalService == null)
// { // {
// m_log.Error("[NEIGHBOUR CONNECTOR]: Can't load neighbour service"); // m_log.Error("[NEIGHBOUR CONNECTOR]: Can't load neighbour service");
// Unregister(); // Unregister();
// return; // return;
// } // }
//} //}
} }
public void Close() public void Close()
{ {
} }
public void AddRegion(Scene scene) public void AddRegion(Scene scene)
{ {
if (!m_Enabled) if (!m_Enabled)
return; return;
m_MapService = scene.CommsManager.GridService; m_MapService = scene.CommsManager.GridService;
m_LocalService.AddRegion(scene); m_LocalService.AddRegion(scene);
scene.RegisterModuleInterface<INeighbourService>(this); scene.RegisterModuleInterface<INeighbourService>(this);
} }
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
{ {
if (m_Enabled && m_Scenes.Contains(scene)) if (m_Enabled && m_Scenes.Contains(scene))
m_LocalService.RemoveRegion(scene); m_LocalService.RemoveRegion(scene);
} }
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)
{ {
if (!m_Enabled) if (!m_Enabled)
return; return;
m_log.InfoFormat("[NEIGHBOUR CONNECTOR]: Enabled remote neighbours for region {0}", scene.RegionInfo.RegionName); m_log.InfoFormat("[NEIGHBOUR CONNECTOR]: Enabled remote neighbours for region {0}", scene.RegionInfo.RegionName);
} }
#region INeighbourService #region INeighbourService
public override bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) public override bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
{ {
if (m_LocalService.HelloNeighbour(regionHandle, thisRegion)) if (m_LocalService.HelloNeighbour(regionHandle, thisRegion))
return true; return true;
return base.HelloNeighbour(regionHandle, thisRegion); return base.HelloNeighbour(regionHandle, thisRegion);
} }
#endregion INeighbourService #endregion INeighbourService
} }
} }

194
OpenSim/Server/Handlers/Base/Utils.cs
View File

@ -1,97 +1,97 @@
/* /*
* 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 OpenSimulator Project nor the * * Neither the name of the OpenSimulator 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 OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Server.Handlers.Base namespace OpenSim.Server.Handlers.Base
{ {
public class RestHandlerUtils public class RestHandlerUtils
{ {
/// <summary> /// <summary>
/// Extract the param from an uri. /// Extract the param from an uri.
/// </summary> /// </summary>
/// <param name="uri">Something like this: /uuid/ or /uuid/handle/release</param> /// <param name="uri">Something like this: /uuid/ or /uuid/handle/release</param>
/// <param name="uri">uuid on uuid field</param> /// <param name="uri">uuid on uuid field</param>
/// <param name="action">optional action</param> /// <param name="action">optional action</param>
public static bool GetParams(string path, out UUID uuid, out ulong regionHandle, out string action) public static bool GetParams(string path, out UUID uuid, out ulong regionHandle, out string action)
{ {
uuid = UUID.Zero; uuid = UUID.Zero;
action = ""; action = "";
regionHandle = 0; regionHandle = 0;
path = path.Trim(new char[] { '/' }); path = path.Trim(new char[] { '/' });
string[] parts = path.Split('/'); string[] parts = path.Split('/');
if (parts.Length <= 1) if (parts.Length <= 1)
{ {
return false; return false;
} }
else else
{ {
if (!UUID.TryParse(parts[0], out uuid)) if (!UUID.TryParse(parts[0], out uuid))
return false; return false;
if (parts.Length >= 2) if (parts.Length >= 2)
UInt64.TryParse(parts[1], out regionHandle); UInt64.TryParse(parts[1], out regionHandle);
if (parts.Length >= 3) if (parts.Length >= 3)
action = parts[2]; action = parts[2];
return true; return true;
} }
} }
public static bool GetAuthentication(OSHttpRequest httpRequest, out string authority, out string authKey) public static bool GetAuthentication(OSHttpRequest httpRequest, out string authority, out string authKey)
{ {
authority = string.Empty; authority = string.Empty;
authKey = string.Empty; authKey = string.Empty;
Uri authUri; Uri authUri;
string auth = httpRequest.Headers["authentication"]; string auth = httpRequest.Headers["authentication"];
// Authentication keys look like this: // Authentication keys look like this:
// http://orgrid.org:8002/<uuid> // http://orgrid.org:8002/<uuid>
if ((auth != null) && (!string.Empty.Equals(auth)) && auth != "None") if ((auth != null) && (!string.Empty.Equals(auth)) && auth != "None")
{ {
if (Uri.TryCreate(auth, UriKind.Absolute, out authUri)) if (Uri.TryCreate(auth, UriKind.Absolute, out authUri))
{ {
authority = authUri.Authority; authority = authUri.Authority;
authKey = authUri.PathAndQuery.Trim('/'); authKey = authUri.PathAndQuery.Trim('/');
return true; return true;
} }
} }
return false; return false;
} }
} }
} }

406
OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
View File

@ -1,203 +1,203 @@
/* /*
* 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 OpenSimulator Project nor the * * Neither the name of the OpenSimulator 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.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Net; using System.Net;
using System.Text; using System.Text;
using OpenSim.Server.Base; using OpenSim.Server.Base;
using OpenSim.Server.Handlers.Base; using OpenSim.Server.Handlers.Base;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.StructuredData; using OpenMetaverse.StructuredData;
using Nini.Config; using Nini.Config;
using log4net; using log4net;
namespace OpenSim.Server.Handlers.Neighbour namespace OpenSim.Server.Handlers.Neighbour
{ {
public class NeighbourGetHandler : BaseStreamHandler public class NeighbourGetHandler : BaseStreamHandler
{ {
// TODO: unused: private ISimulationService m_SimulationService; // TODO: unused: private ISimulationService m_SimulationService;
// TODO: unused: private IAuthenticationService m_AuthenticationService; // TODO: unused: private IAuthenticationService m_AuthenticationService;
public NeighbourGetHandler(INeighbourService service, IAuthenticationService authentication) : public NeighbourGetHandler(INeighbourService service, IAuthenticationService authentication) :
base("GET", "/region") base("GET", "/region")
{ {
// TODO: unused: m_SimulationService = service; // TODO: unused: m_SimulationService = service;
// TODO: unused: m_AuthenticationService = authentication; // TODO: unused: m_AuthenticationService = authentication;
} }
public override byte[] Handle(string path, Stream request, public override byte[] Handle(string path, Stream request,
OSHttpRequest httpRequest, OSHttpResponse httpResponse) OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
// Not implemented yet // Not implemented yet
Console.WriteLine("--- Get region --- " + path); Console.WriteLine("--- Get region --- " + path);
httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented; httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented;
return new byte[] { }; return new byte[] { };
} }
} }
public class NeighbourPostHandler : BaseStreamHandler public class NeighbourPostHandler : BaseStreamHandler
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private INeighbourService m_NeighbourService; private INeighbourService m_NeighbourService;
private IAuthenticationService m_AuthenticationService; private IAuthenticationService m_AuthenticationService;
// TODO: unused: private bool m_AllowForeignGuests; // TODO: unused: private bool m_AllowForeignGuests;
public NeighbourPostHandler(INeighbourService service, IAuthenticationService authentication) : public NeighbourPostHandler(INeighbourService service, IAuthenticationService authentication) :
base("POST", "/region") base("POST", "/region")
{ {
m_NeighbourService = service; m_NeighbourService = service;
m_AuthenticationService = authentication; m_AuthenticationService = authentication;
// TODO: unused: m_AllowForeignGuests = foreignGuests; // TODO: unused: m_AllowForeignGuests = foreignGuests;
} }
public override byte[] Handle(string path, Stream request, public override byte[] Handle(string path, Stream request,
OSHttpRequest httpRequest, OSHttpResponse httpResponse) OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
byte[] result = new byte[0]; byte[] result = new byte[0];
UUID regionID; UUID regionID;
string action; string action;
ulong regionHandle; ulong regionHandle;
if (RestHandlerUtils.GetParams(path, out regionID, out regionHandle, out action)) if (RestHandlerUtils.GetParams(path, out regionID, out regionHandle, out action))
{ {
m_log.InfoFormat("[RegionPostHandler]: Invalid parameters for neighbour message {0}", path); m_log.InfoFormat("[RegionPostHandler]: Invalid parameters for neighbour message {0}", path);
httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
httpResponse.StatusDescription = "Invalid parameters for neighbour message " + path; httpResponse.StatusDescription = "Invalid parameters for neighbour message " + path;
return result; return result;
} }
if (m_AuthenticationService != null) if (m_AuthenticationService != null)
{ {
// Authentication // Authentication
string authority = string.Empty; string authority = string.Empty;
string authToken = string.Empty; string authToken = string.Empty;
if (!RestHandlerUtils.GetAuthentication(httpRequest, out authority, out authToken)) if (!RestHandlerUtils.GetAuthentication(httpRequest, out authority, out authToken))
{ {
m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path); m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path);
httpResponse.StatusCode = (int)HttpStatusCode.Unauthorized; httpResponse.StatusCode = (int)HttpStatusCode.Unauthorized;
return result; return result;
} }
if (!m_AuthenticationService.VerifyUserKey(regionID, authToken)) if (!m_AuthenticationService.VerifyUserKey(regionID, authToken))
{ {
m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path); m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path);
httpResponse.StatusCode = (int)HttpStatusCode.Forbidden; httpResponse.StatusCode = (int)HttpStatusCode.Forbidden;
return result; return result;
} }
m_log.DebugFormat("[RegionPostHandler]: Authentication succeeded for {0}", regionID); m_log.DebugFormat("[RegionPostHandler]: Authentication succeeded for {0}", regionID);
} }
OSDMap args = Util.GetOSDMap(request, (int)httpRequest.ContentLength); OSDMap args = Util.GetOSDMap(request, (int)httpRequest.ContentLength);
if (args == null) if (args == null)
{ {
httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
httpResponse.StatusDescription = "Unable to retrieve data"; httpResponse.StatusDescription = "Unable to retrieve data";
m_log.DebugFormat("[RegionPostHandler]: Unable to retrieve data for post {0}", path); m_log.DebugFormat("[RegionPostHandler]: Unable to retrieve data for post {0}", path);
return result; return result;
} }
// retrieve the regionhandle // retrieve the regionhandle
ulong regionhandle = 0; ulong regionhandle = 0;
if (args["destination_handle"] != null) if (args["destination_handle"] != null)
UInt64.TryParse(args["destination_handle"].AsString(), out regionhandle); UInt64.TryParse(args["destination_handle"].AsString(), out regionhandle);
RegionInfo aRegion = new RegionInfo(); RegionInfo aRegion = new RegionInfo();
try try
{ {
aRegion.UnpackRegionInfoData(args); aRegion.UnpackRegionInfoData(args);
} }
catch (Exception ex) catch (Exception ex)
{ {
m_log.InfoFormat("[RegionPostHandler]: exception on unpacking region info {0}", ex.Message); m_log.InfoFormat("[RegionPostHandler]: exception on unpacking region info {0}", ex.Message);
httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
httpResponse.StatusDescription = "Problems with data deserialization"; httpResponse.StatusDescription = "Problems with data deserialization";
return result; return result;
} }
// Finally! // Finally!
bool success = m_NeighbourService.HelloNeighbour(regionhandle, aRegion); bool success = m_NeighbourService.HelloNeighbour(regionhandle, aRegion);
OSDMap resp = new OSDMap(1); OSDMap resp = new OSDMap(1);
resp["success"] = OSD.FromBoolean(success); resp["success"] = OSD.FromBoolean(success);
httpResponse.StatusCode = (int)HttpStatusCode.OK; httpResponse.StatusCode = (int)HttpStatusCode.OK;
return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp));
} }
} }
public class NeighbourPutHandler : BaseStreamHandler public class NeighbourPutHandler : BaseStreamHandler
{ {
// TODO: unused: private ISimulationService m_SimulationService; // TODO: unused: private ISimulationService m_SimulationService;
// TODO: unused: private IAuthenticationService m_AuthenticationService; // TODO: unused: private IAuthenticationService m_AuthenticationService;
public NeighbourPutHandler(INeighbourService service, IAuthenticationService authentication) : public NeighbourPutHandler(INeighbourService service, IAuthenticationService authentication) :
base("PUT", "/region") base("PUT", "/region")
{ {
// TODO: unused: m_SimulationService = service; // TODO: unused: m_SimulationService = service;
// TODO: unused: m_AuthenticationService = authentication; // TODO: unused: m_AuthenticationService = authentication;
} }
public override byte[] Handle(string path, Stream request, public override byte[] Handle(string path, Stream request,
OSHttpRequest httpRequest, OSHttpResponse httpResponse) OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
// Not implemented yet // Not implemented yet
httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented; httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented;
return new byte[] { }; return new byte[] { };
} }
} }
public class NeighbourDeleteHandler : BaseStreamHandler public class NeighbourDeleteHandler : BaseStreamHandler
{ {
// TODO: unused: private ISimulationService m_SimulationService; // TODO: unused: private ISimulationService m_SimulationService;
// TODO: unused: private IAuthenticationService m_AuthenticationService; // TODO: unused: private IAuthenticationService m_AuthenticationService;
public NeighbourDeleteHandler(INeighbourService service, IAuthenticationService authentication) : public NeighbourDeleteHandler(INeighbourService service, IAuthenticationService authentication) :
base("DELETE", "/region") base("DELETE", "/region")
{ {
// TODO: unused: m_SimulationService = service; // TODO: unused: m_SimulationService = service;
// TODO: unused: m_AuthenticationService = authentication; // TODO: unused: m_AuthenticationService = authentication;
} }
public override byte[] Handle(string path, Stream request, public override byte[] Handle(string path, Stream request,
OSHttpRequest httpRequest, OSHttpResponse httpResponse) OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
// Not implemented yet // Not implemented yet
httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented; httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented;
return new byte[] { }; return new byte[] { };
} }
} }
} }

136
OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
View File

@ -1,68 +1,68 @@
/* /*
* 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 OpenSimulator Project nor the * * Neither the name of the OpenSimulator 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.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Server.Base; using OpenSim.Server.Base;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Server.Handlers.Base; using OpenSim.Server.Handlers.Base;
namespace OpenSim.Server.Handlers.Neighbour namespace OpenSim.Server.Handlers.Neighbour
{ {
public class NeighbourServiceInConnector : ServiceConnector public class NeighbourServiceInConnector : ServiceConnector
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private INeighbourService m_NeighbourService; private INeighbourService m_NeighbourService;
private IAuthenticationService m_AuthenticationService = null; private IAuthenticationService m_AuthenticationService = null;
public NeighbourServiceInConnector(IConfigSource source, IHttpServer server, INeighbourService nService, IScene scene) : public NeighbourServiceInConnector(IConfigSource source, IHttpServer server, INeighbourService nService, IScene scene) :
base(source, server) base(source, server)
{ {
m_NeighbourService = nService; m_NeighbourService = nService;
if (m_NeighbourService == null) if (m_NeighbourService == null)
{ {
m_log.Error("[NEIGHBOUR IN CONNECTOR]: neighbour service was not provided"); m_log.Error("[NEIGHBOUR IN CONNECTOR]: neighbour service was not provided");
return; return;
} }
//bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false); //bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false);
//if (authentication) //if (authentication)
// m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>(); // m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>();
server.AddStreamHandler(new NeighbourPostHandler(m_NeighbourService, m_AuthenticationService)); server.AddStreamHandler(new NeighbourPostHandler(m_NeighbourService, m_AuthenticationService));
server.AddStreamHandler(new NeighbourGetHandler(m_NeighbourService, m_AuthenticationService)); server.AddStreamHandler(new NeighbourGetHandler(m_NeighbourService, m_AuthenticationService));
} }
} }
} }

340
OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
View File

@ -1,170 +1,170 @@
/* /*
* 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 OpenSimulator Project nor the * * Neither the name of the OpenSimulator 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 log4net; using log4net;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Services.Connectors namespace OpenSim.Services.Connectors
{ {
/// <summary> /// <summary>
/// This connector is temporary. It's used by the user server, before that server is refactored. /// This connector is temporary. It's used by the user server, before that server is refactored.
/// </summary> /// </summary>
public class QuickAndDirtyInventoryServiceConnector : IInventoryService public class QuickAndDirtyInventoryServiceConnector : IInventoryService
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger( LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType); MethodBase.GetCurrentMethod().DeclaringType);
private string m_ServerURI = String.Empty; private string m_ServerURI = String.Empty;
private Dictionary<UUID, InventoryReceiptCallback> m_RequestingInventory = new Dictionary<UUID, InventoryReceiptCallback>(); private Dictionary<UUID, InventoryReceiptCallback> m_RequestingInventory = new Dictionary<UUID, InventoryReceiptCallback>();
public QuickAndDirtyInventoryServiceConnector() public QuickAndDirtyInventoryServiceConnector()
{ {
} }
public QuickAndDirtyInventoryServiceConnector(string serverURI) public QuickAndDirtyInventoryServiceConnector(string serverURI)
{ {
m_ServerURI = serverURI.TrimEnd('/'); m_ServerURI = serverURI.TrimEnd('/');
} }
/// <summary> /// <summary>
/// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/> /// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/>
/// </summary> /// </summary>
/// <param name="userId"></param> /// <param name="userId"></param>
/// <returns></returns> /// <returns></returns>
public bool CreateUserInventory(UUID userId) public bool CreateUserInventory(UUID userId)
{ {
return SynchronousRestObjectPoster.BeginPostObject<Guid, bool>( return SynchronousRestObjectPoster.BeginPostObject<Guid, bool>(
"POST", m_ServerURI + "CreateInventory/", userId.Guid); "POST", m_ServerURI + "CreateInventory/", userId.Guid);
} }
/// <summary> /// <summary>
/// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/> /// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/>
/// </summary> /// </summary>
/// <param name="userId"></param> /// <param name="userId"></param>
/// <returns></returns> /// <returns></returns>
public List<InventoryFolderBase> GetInventorySkeleton(UUID userId) public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
{ {
return SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>( return SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>(
"POST", m_ServerURI + "RootFolders/", userId.Guid); "POST", m_ServerURI + "RootFolders/", userId.Guid);
} }
/// <summary> /// <summary>
/// Returns a list of all the active gestures in a user's inventory. /// Returns a list of all the active gestures in a user's inventory.
/// </summary> /// </summary>
/// <param name="userId"> /// <param name="userId">
/// The <see cref="UUID"/> of the user /// The <see cref="UUID"/> of the user
/// </param> /// </param>
/// <returns> /// <returns>
/// A flat list of the gesture items. /// A flat list of the gesture items.
/// </returns> /// </returns>
public List<InventoryItemBase> GetActiveGestures(UUID userId) public List<InventoryItemBase> GetActiveGestures(UUID userId)
{ {
return SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryItemBase>>( return SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryItemBase>>(
"POST", m_ServerURI + "ActiveGestures/", userId.Guid); "POST", m_ServerURI + "ActiveGestures/", userId.Guid);
} }
public InventoryCollection GetUserInventory(UUID userID) public InventoryCollection GetUserInventory(UUID userID)
{ {
return null; return null;
} }
public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
{ {
} }
public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
{ {
return null; return null;
} }
public bool AddFolder(InventoryFolderBase folder) public bool AddFolder(InventoryFolderBase folder)
{ {
return false; return false;
} }
public bool UpdateFolder(InventoryFolderBase folder) public bool UpdateFolder(InventoryFolderBase folder)
{ {
return false; return false;
} }
public bool MoveFolder(InventoryFolderBase folder) public bool MoveFolder(InventoryFolderBase folder)
{ {
return false; return false;
} }
public bool PurgeFolder(InventoryFolderBase folder) public bool PurgeFolder(InventoryFolderBase folder)
{ {
return false; return false;
} }
public bool AddItem(InventoryItemBase item) public bool AddItem(InventoryItemBase item)
{ {
return false; return false;
} }
public bool UpdateItem(InventoryItemBase item) public bool UpdateItem(InventoryItemBase item)
{ {
return false; return false;
} }
public bool DeleteItem(InventoryItemBase item) public bool DeleteItem(InventoryItemBase item)
{ {
return false; return false;
} }
public InventoryItemBase QueryItem(InventoryItemBase item) public InventoryItemBase QueryItem(InventoryItemBase item)
{ {
return null; return null;
} }
public InventoryFolderBase QueryFolder(InventoryFolderBase folder) public InventoryFolderBase QueryFolder(InventoryFolderBase folder)
{ {
return null; return null;
} }
public bool HasInventoryForUser(UUID userID) public bool HasInventoryForUser(UUID userID)
{ {
return false; return false;
} }
public InventoryFolderBase RequestRootFolder(UUID userID) public InventoryFolderBase RequestRootFolder(UUID userID)
{ {
return null; return null;
} }
} }
} }

332
OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
View File

@ -1,166 +1,166 @@
/* /*
* 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 OpenSimulator Project nor the * * Neither the name of the OpenSimulator 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 log4net; using log4net;
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.StructuredData; using OpenMetaverse.StructuredData;
namespace OpenSim.Services.Connectors namespace OpenSim.Services.Connectors
{ {
public class NeighbourServicesConnector : INeighbourService public class NeighbourServicesConnector : INeighbourService
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger( LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType); MethodBase.GetCurrentMethod().DeclaringType);
protected IGridServices m_MapService = null; protected IGridServices m_MapService = null;
public NeighbourServicesConnector() public NeighbourServicesConnector()
{ {
} }
public NeighbourServicesConnector(IGridServices gridServices) public NeighbourServicesConnector(IGridServices gridServices)
{ {
Initialise(gridServices); Initialise(gridServices);
} }
public virtual void Initialise(IGridServices gridServices) public virtual void Initialise(IGridServices gridServices)
{ {
m_MapService = gridServices; m_MapService = gridServices;
} }
public virtual bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) public virtual bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
{ {
RegionInfo regInfo = m_MapService.RequestNeighbourInfo(regionHandle); RegionInfo regInfo = m_MapService.RequestNeighbourInfo(regionHandle);
if ((regInfo != null) && if ((regInfo != null) &&
// Don't remote-call this instance; that's a startup hickup // Don't remote-call this instance; that's a startup hickup
!((regInfo.ExternalHostName == thisRegion.ExternalHostName) && (regInfo.HttpPort == thisRegion.HttpPort))) !((regInfo.ExternalHostName == thisRegion.ExternalHostName) && (regInfo.HttpPort == thisRegion.HttpPort)))
{ {
return DoHelloNeighbourCall(regInfo, thisRegion); return DoHelloNeighbourCall(regInfo, thisRegion);
} }
//else //else
// m_log.Warn("[REST COMMS]: Region not found " + regionHandle); // m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
return false; return false;
} }
public bool DoHelloNeighbourCall(RegionInfo region, RegionInfo thisRegion) public bool DoHelloNeighbourCall(RegionInfo region, RegionInfo thisRegion)
{ {
string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/region/" + thisRegion.RegionID + "/"; string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/region/" + thisRegion.RegionID + "/";
//m_log.Debug(" >>> DoHelloNeighbourCall <<< " + uri); //m_log.Debug(" >>> DoHelloNeighbourCall <<< " + uri);
WebRequest HelloNeighbourRequest = WebRequest.Create(uri); WebRequest HelloNeighbourRequest = WebRequest.Create(uri);
HelloNeighbourRequest.Method = "POST"; HelloNeighbourRequest.Method = "POST";
HelloNeighbourRequest.ContentType = "application/json"; HelloNeighbourRequest.ContentType = "application/json";
HelloNeighbourRequest.Timeout = 10000; HelloNeighbourRequest.Timeout = 10000;
// Fill it in // Fill it in
OSDMap args = null; OSDMap args = null;
try try
{ {
args = thisRegion.PackRegionInfoData(); args = thisRegion.PackRegionInfoData();
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Debug("[REST COMMS]: PackRegionInfoData failed with exception: " + e.Message); m_log.Debug("[REST COMMS]: PackRegionInfoData failed with exception: " + e.Message);
} }
// Add the regionhandle of the destination region // Add the regionhandle of the destination region
args["destination_handle"] = OSD.FromString(region.RegionHandle.ToString()); args["destination_handle"] = OSD.FromString(region.RegionHandle.ToString());
string strBuffer = ""; string strBuffer = "";
byte[] buffer = new byte[1]; byte[] buffer = new byte[1];
try try
{ {
strBuffer = OSDParser.SerializeJsonString(args); strBuffer = OSDParser.SerializeJsonString(args);
UTF8Encoding str = new UTF8Encoding(); UTF8Encoding str = new UTF8Encoding();
buffer = str.GetBytes(strBuffer); buffer = str.GetBytes(strBuffer);
} }
catch (Exception e) catch (Exception e)
{ {
m_log.WarnFormat("[REST COMMS]: Exception thrown on serialization of HelloNeighbour: {0}", e.Message); m_log.WarnFormat("[REST COMMS]: Exception thrown on serialization of HelloNeighbour: {0}", e.Message);
// ignore. buffer will be empty, caller should check. // ignore. buffer will be empty, caller should check.
} }
Stream os = null; Stream os = null;
try try
{ // send the Post { // send the Post
HelloNeighbourRequest.ContentLength = buffer.Length; //Count bytes to send HelloNeighbourRequest.ContentLength = buffer.Length; //Count bytes to send
os = HelloNeighbourRequest.GetRequestStream(); os = HelloNeighbourRequest.GetRequestStream();
os.Write(buffer, 0, strBuffer.Length); //Send it os.Write(buffer, 0, strBuffer.Length); //Send it
os.Close(); os.Close();
//m_log.InfoFormat("[REST COMMS]: Posted HelloNeighbour request to remote sim {0}", uri); //m_log.InfoFormat("[REST COMMS]: Posted HelloNeighbour request to remote sim {0}", uri);
} }
//catch (WebException ex) //catch (WebException ex)
catch catch
{ {
//m_log.InfoFormat("[REST COMMS]: Bad send on HelloNeighbour {0}", ex.Message); //m_log.InfoFormat("[REST COMMS]: Bad send on HelloNeighbour {0}", ex.Message);
return false; return false;
} }
// Let's wait for the response // Let's wait for the response
//m_log.Info("[REST COMMS]: Waiting for a reply after DoHelloNeighbourCall"); //m_log.Info("[REST COMMS]: Waiting for a reply after DoHelloNeighbourCall");
try try
{ {
WebResponse webResponse = HelloNeighbourRequest.GetResponse(); WebResponse webResponse = HelloNeighbourRequest.GetResponse();
if (webResponse == null) if (webResponse == null)
{ {
m_log.Info("[REST COMMS]: Null reply on DoHelloNeighbourCall post"); m_log.Info("[REST COMMS]: Null reply on DoHelloNeighbourCall post");
} }
StreamReader sr = new StreamReader(webResponse.GetResponseStream()); StreamReader sr = new StreamReader(webResponse.GetResponseStream());
//reply = sr.ReadToEnd().Trim(); //reply = sr.ReadToEnd().Trim();
sr.ReadToEnd().Trim(); sr.ReadToEnd().Trim();
sr.Close(); sr.Close();
//m_log.InfoFormat("[REST COMMS]: DoHelloNeighbourCall reply was {0} ", reply); //m_log.InfoFormat("[REST COMMS]: DoHelloNeighbourCall reply was {0} ", reply);
} }
catch (WebException ex) catch (WebException ex)
{ {
m_log.InfoFormat("[REST COMMS]: exception on reply of DoHelloNeighbourCall {0}", ex.Message); m_log.InfoFormat("[REST COMMS]: exception on reply of DoHelloNeighbourCall {0}", ex.Message);
// ignore, really // ignore, really
} }
return true; return true;
} }
} }
} }

76
OpenSim/Services/Interfaces/INeighbourService.cs
View File

@ -1,38 +1,38 @@
/* /*
* 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 OpenSimulator Project nor the * * Neither the name of the OpenSimulator 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 OpenSim.Framework; using OpenSim.Framework;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Services.Interfaces namespace OpenSim.Services.Interfaces
{ {
public interface INeighbourService public interface INeighbourService
{ {
bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion); bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion);
} }
} }

274
OpenSim/SimulatorServices/NeighbourServiceInConnectorModule.cs
View File

@ -1,137 +1,137 @@
/* /*
* 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 OpenSimulator Project nor the * * Neither the name of the OpenSimulator 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.Reflection; using System.Reflection;
using System.Collections.Generic; using System.Collections.Generic;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Server.Base; using OpenSim.Server.Base;
using OpenSim.Server.Handlers.Base; using OpenSim.Server.Handlers.Base;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
namespace OpenSim.SimulatorServices namespace OpenSim.SimulatorServices
{ {
public class NeighbourServiceInConnectorModule : ISharedRegionModule, INeighbourService public class NeighbourServiceInConnectorModule : ISharedRegionModule, INeighbourService
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static bool m_Enabled = false; private static bool m_Enabled = false;
private static bool m_Registered = false; private static bool m_Registered = false;
private IConfigSource m_Config; private IConfigSource m_Config;
private List<Scene> m_Scenes = new List<Scene>(); private List<Scene> m_Scenes = new List<Scene>();
#region IRegionModule interface #region IRegionModule interface
public void Initialise(IConfigSource config) public void Initialise(IConfigSource config)
{ {
m_Config = config; m_Config = config;
IConfig moduleConfig = config.Configs["Modules"]; IConfig moduleConfig = config.Configs["Modules"];
if (moduleConfig != null) if (moduleConfig != null)
{ {
m_Enabled = moduleConfig.GetBoolean("NeighbourServiceInConnector", false); m_Enabled = moduleConfig.GetBoolean("NeighbourServiceInConnector", false);
if (m_Enabled) if (m_Enabled)
{ {
m_log.Info("[NEIGHBOUR IN CONNECTOR]: NeighbourServiceInConnector enabled"); m_log.Info("[NEIGHBOUR IN CONNECTOR]: NeighbourServiceInConnector enabled");
} }
} }
} }
public void PostInitialise() public void PostInitialise()
{ {
if (!m_Enabled) if (!m_Enabled)
return; return;
m_log.Info("[NEIGHBOUR IN CONNECTOR]: Starting..."); m_log.Info("[NEIGHBOUR IN CONNECTOR]: Starting...");
} }
public void Close() public void Close()
{ {
} }
public string Name public string Name
{ {
get { return "NeighbourServiceInConnectorModule"; } get { return "NeighbourServiceInConnectorModule"; }
} }
public void AddRegion(Scene scene) public void AddRegion(Scene scene)
{ {
if (!m_Enabled) if (!m_Enabled)
return; return;
if (!m_Registered) if (!m_Registered)
{ {
m_Registered = true; m_Registered = true;
Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, this, scene }; Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, this, scene };
ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:NeighbourServiceInConnector", args); ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:NeighbourServiceInConnector", args);
} }
m_Scenes.Add(scene); m_Scenes.Add(scene);
} }
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
{ {
if (m_Enabled && m_Scenes.Contains(scene)) if (m_Enabled && m_Scenes.Contains(scene))
m_Scenes.Remove(scene); m_Scenes.Remove(scene);
} }
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)
{ {
} }
#endregion #endregion
#region INeighbourService #region INeighbourService
public bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) public bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
{ {
m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}", m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}",
thisRegion.RegionName, regionHandle, m_Scenes.Count); thisRegion.RegionName, regionHandle, m_Scenes.Count);
foreach (Scene s in m_Scenes) foreach (Scene s in m_Scenes)
{ {
if (s.RegionInfo.RegionHandle == regionHandle) if (s.RegionInfo.RegionHandle == regionHandle)
{ {
m_log.Debug("[NEIGHBOUR IN CONNECTOR]: Found region to SendHelloNeighbour"); m_log.Debug("[NEIGHBOUR IN CONNECTOR]: Found region to SendHelloNeighbour");
return s.IncomingHelloNeighbour(thisRegion); return s.IncomingHelloNeighbour(thisRegion);
} }
} }
m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: region handle {0} not found", regionHandle); m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: region handle {0} not found", regionHandle);
return false; return false;
} }
#endregion INeighbourService #endregion INeighbourService
} }
} }

204
OpenSim/SimulatorServices/RegionInventoryService.cs
View File

@ -1,102 +1,102 @@
/* /*
* 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 OpenSimulator Project nor the * * Neither the name of the OpenSimulator 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.Reflection; using System.Reflection;
using System.Collections.Generic; using System.Collections.Generic;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Server.Base; using OpenSim.Server.Base;
using OpenSim.Server.Handlers.Base; using OpenSim.Server.Handlers.Base;
namespace OpenSim.SimulatorServices namespace OpenSim.SimulatorServices
{ {
public class RegionInventoryService : ISharedRegionModule public class RegionInventoryService : ISharedRegionModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static bool enabled = false; private static bool enabled = false;
private IConfigSource m_Config; private IConfigSource m_Config;
bool m_Registered = false; bool m_Registered = false;
#region IRegionModule interface #region IRegionModule interface
public void Initialise(IConfigSource config) public void Initialise(IConfigSource config)
{ {
// This module is only on for standalones in hypergrid mode // This module is only on for standalones in hypergrid mode
enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) && enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
config.Configs["Startup"].GetBoolean("hypergrid", true); config.Configs["Startup"].GetBoolean("hypergrid", true);
m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled); m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled);
m_Config = config; m_Config = config;
} }
public void PostInitialise() public void PostInitialise()
{ {
} }
public void Close() public void Close()
{ {
} }
public string Name public string Name
{ {
get { return "RegionInventoryService"; } get { return "RegionInventoryService"; }
} }
public void AddRegion(Scene scene) public void AddRegion(Scene scene)
{ {
if (!enabled) if (!enabled)
return; return;
if (!m_Registered) if (!m_Registered)
{ {
m_Registered = true; m_Registered = true;
m_log.Info("[RegionInventoryService]: Starting..."); m_log.Info("[RegionInventoryService]: Starting...");
Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer }; Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args); ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args);
} }
} }
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
{ {
} }
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)
{ {
} }
#endregion #endregion
} }
} }

26
bin/config-include/CenomeCache.ini.example
View File

@ -1,13 +1,13 @@
[AssetCache] [AssetCache]
;; ;;
;; Options for CenmoeAssetCache ;; Options for CenmoeAssetCache
;; ;;
; 256 MB (default: 134217728) ; 256 MB (default: 134217728)
MaxSize = 268435456 MaxSize = 268435456
; How many assets it is possible to store cache (default: 4096) ; How many assets it is possible to store cache (default: 4096)
MaxCount = 16384 MaxCount = 16384
; Expiration time - 1 hour (default: 30 minutes) ; Expiration time - 1 hour (default: 30 minutes)
ExpirationTime = 60 ExpirationTime = 60

78
bin/config-include/FlotsamCache.ini.example
View File

@ -1,39 +1,39 @@
[AssetCache] [AssetCache]
;; ;;
;; Options for FlotsamAssetCache ;; Options for FlotsamAssetCache
;; ;;
; cache directory can be shared by multiple instances ; cache directory can be shared by multiple instances
CacheDirectory = ./assetcache CacheDirectory = ./assetcache
; Other examples: ; Other examples:
;CacheDirectory = /directory/writable/by/OpenSim/instance ;CacheDirectory = /directory/writable/by/OpenSim/instance
; Log level ; Log level
; 0 - (Error) Errors only ; 0 - (Error) Errors only
; 1 - (Info) Hit Rate Stats + Level 0 ; 1 - (Info) Hit Rate Stats + Level 0
; 2 - (Debug) Cache Activity (Reads/Writes) + Level 1 ; 2 - (Debug) Cache Activity (Reads/Writes) + Level 1
; ;
LogLevel = 0 LogLevel = 0
; How often should hit rates be displayed (given in AssetRequests) ; How often should hit rates be displayed (given in AssetRequests)
; 0 to disable ; 0 to disable
HitRateDisplay = 100 HitRateDisplay = 100
; Set to false for disk cache only. ; Set to false for disk cache only.
MemoryCacheEnabled = false MemoryCacheEnabled = false
; How long {in hours} to keep assets cached in memory, .5 == 30 minutes ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
MemoryCacheTimeout = 2 MemoryCacheTimeout = 2
; How long {in hours} to keep assets cached on disk, .5 == 30 minutes ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
; Specify 0 if you do not want your disk cache to expire ; Specify 0 if you do not want your disk cache to expire
FileCacheTimeout = 0 FileCacheTimeout = 0
; How often {in hours} should the disk be checked for expired filed ; How often {in hours} should the disk be checked for expired filed
; Specify 0 to disable expiration checking ; Specify 0 to disable expiration checking
FileCleanupTimer = .166 ;roughly every 10 minutes FileCleanupTimer = .166 ;roughly every 10 minutes
; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how
; long (in miliseconds) to block a request thread while trying to complete ; long (in miliseconds) to block a request thread while trying to complete
; an existing write to disk. ; an existing write to disk.
; WaitOnInprogressTimeout = 3000 ; WaitOnInprogressTimeout = 3000