1 files changed, 137 insertions, 0 deletions
diff --git a/OpenSim/SimulatorServices/NeighbourServiceInConnectorModule.cs b/OpenSim/SimulatorServices/NeighbourServiceInConnectorModule.cs
new file mode 100644
index 0000000..e281ebb
--- /dev/null
+++ b/OpenSim/SimulatorServices/NeighbourServiceInConnectorModule.cs
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * 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
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using log4net;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Server.Base;
+using OpenSim.Server.Handlers.Base;
+using OpenSim.Services.Interfaces;
+namespace OpenSim.SimulatorServices
+{
+    public class NeighbourServiceInConnectorModule : ISharedRegionModule, INeighbourService
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static bool m_Enabled = false;
+        private static bool m_Registered = false;
+        private IConfigSource m_Config;
+        private List<Scene> m_Scenes = new List<Scene>();
+        #region IRegionModule interface
+        public void Initialise(IConfigSource config)
+        {
+            m_Config = config;
+            IConfig moduleConfig = config.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                m_Enabled = moduleConfig.GetBoolean("NeighbourServiceInConnector", false);
+                if (m_Enabled)
+                {
+                    m_log.Info("[NEIGHBOUR IN CONNECTOR]: NeighbourServiceInConnector enabled");
+                }
+            }
+        }
+        public void PostInitialise()
+        {
+            if (!m_Enabled)
+                return;
+            m_log.Info("[NEIGHBOUR IN CONNECTOR]: Starting...");
+        }
+        public void Close()
+        {
+        }
+        public string Name
+        {
+            get { return "NeighbourServiceInConnectorModule"; }
+        }
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+            if (!m_Registered)
+            {
+                m_Registered = true;
+                Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, this, scene };
+                ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:NeighbourServiceInConnector", args);
+            }
+            m_Scenes.Add(scene);
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_Enabled && m_Scenes.Contains(scene))
+                m_Scenes.Remove(scene);
+        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        #endregion
+        #region INeighbourService
+        public bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
+        {
+            m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}",
+                thisRegion.RegionName, regionHandle, m_Scenes.Count);
+            foreach (Scene s in m_Scenes)
+            {
+                if (s.RegionInfo.RegionHandle == regionHandle)
+                {
+                    m_log.Debug("[NEIGHBOUR IN CONNECTOR]: Found region to SendHelloNeighbour");
+                    return s.IncomingHelloNeighbour(thisRegion);
+                }
+            }
+            m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: region handle {0} not found", regionHandle);
+            return false;
+        }
+        #endregion INeighbourService
+    }
+}

diff --git a/OpenSim/SimulatorServices/NeighbourServiceInConnectorModule.cs b/OpenSim/SimulatorServices/NeighbourServiceInConnectorModule.cs new file mode 100644 index 0000000..e281ebb --- /dev/null +++ b/OpenSim/SimulatorServices/NeighbourServiceInConnectorModule.cs
@@ -0,0 +1,137 @@
	1	/*
	2	* Copyright (c) Contributors, http://opensimulator.org/
	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
	4	*
	5	* Redistribution and use in source and binary forms, with or without
	6	* modification, are permitted provided that the following conditions are met:
	7	* * Redistributions of source code must retain the above copyright
	8	* notice, this list of conditions and the following disclaimer.
	9	* * Redistributions in binary form must reproduce the above copyright
	10	* notice, this list of conditions and the following disclaimer in the
	11	* documentation and/or other materials provided with the distribution.
	12	* * Neither the name of the OpenSimulator Project nor the
	13	* names of its contributors may be used to endorse or promote products
	14	* derived from this software without specific prior written permission.
	15	*
	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	26	*/
	27
	28	using System;
	29	using System.Reflection;
	30	using System.Collections.Generic;
	31	using log4net;
	32	using Nini.Config;
	33	using OpenSim.Framework;
	34	using OpenSim.Framework.Servers.HttpServer;
	35	using OpenSim.Region.Framework.Scenes;
	36	using OpenSim.Region.Framework.Interfaces;
	37	using OpenSim.Server.Base;
	38	using OpenSim.Server.Handlers.Base;
	39	using OpenSim.Services.Interfaces;
	40
	41
	42	namespace OpenSim.SimulatorServices
	43	{
	44	public class NeighbourServiceInConnectorModule : ISharedRegionModule, INeighbourService
	45	{
	46	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
	47	private static bool m_Enabled = false;
	48	private static bool m_Registered = false;
	49
	50	private IConfigSource m_Config;
	51	private List<Scene> m_Scenes = new List<Scene>();
	52
	53	#region IRegionModule interface
	54
	55	public void Initialise(IConfigSource config)
	56	{
	57	m_Config = config;
	58
	59	IConfig moduleConfig = config.Configs["Modules"];
	60	if (moduleConfig != null)
	61	{
	62	m_Enabled = moduleConfig.GetBoolean("NeighbourServiceInConnector", false);
	63	if (m_Enabled)
	64	{
	65	m_log.Info("[NEIGHBOUR IN CONNECTOR]: NeighbourServiceInConnector enabled");
	66	}
	67
	68	}
	69
	70	}
	71
	72	public void PostInitialise()
	73	{
	74	if (!m_Enabled)
	75	return;
	76
	77	m_log.Info("[NEIGHBOUR IN CONNECTOR]: Starting...");
	78	}
	79
	80	public void Close()
	81	{
	82	}
	83
	84	public string Name
	85	{
	86	get { return "NeighbourServiceInConnectorModule"; }
	87	}
	88
	89	public void AddRegion(Scene scene)
	90	{
	91	if (!m_Enabled)
	92	return;
	93
	94	if (!m_Registered)
	95	{
	96	m_Registered = true;
	97	Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, this, scene };
	98	ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:NeighbourServiceInConnector", args);
	99	}
	100
	101	m_Scenes.Add(scene);
	102
	103	}
	104
	105	public void RemoveRegion(Scene scene)
	106	{
	107	if (m_Enabled && m_Scenes.Contains(scene))
	108	m_Scenes.Remove(scene);
	109	}
	110
	111	public void RegionLoaded(Scene scene)
	112	{
	113	}
	114
	115	#endregion
	116
	117	#region INeighbourService
	118
	119	public bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
	120	{
	121	m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}",
	122	thisRegion.RegionName, regionHandle, m_Scenes.Count);
	123	foreach (Scene s in m_Scenes)
	124	{
	125	if (s.RegionInfo.RegionHandle == regionHandle)
	126	{
	127	m_log.Debug("[NEIGHBOUR IN CONNECTOR]: Found region to SendHelloNeighbour");
	128	return s.IncomingHelloNeighbour(thisRegion);
	129	}
	130	}
	131	m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: region handle {0} not found", regionHandle);
	132	return false;
	133	}
	134
	135	#endregion INeighbourService
	136	}
	137	}