diff --git a/OpenSim/Framework/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs
index 09333bd9a6..56b40bdad3 100644
--- a/OpenSim/Framework/AgentCircuitManager.cs
+++ b/OpenSim/Framework/AgentCircuitManager.cs
@@ -81,13 +81,25 @@ namespace OpenSim.Framework
///
public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData)
{
- if (AgentCircuits.ContainsKey(circuitCode))
+ lock (AgentCircuits)
{
- AgentCircuits[circuitCode] = agentData;
+ if (AgentCircuits.ContainsKey(circuitCode))
+ {
+ AgentCircuits[circuitCode] = agentData;
+ }
+ else
+ {
+ AgentCircuits.Add(circuitCode, agentData);
+ }
}
- else
+ }
+
+ public virtual void RemoveCircuit(uint circuitCode)
+ {
+ lock (AgentCircuits)
{
- AgentCircuits.Add(circuitCode, agentData);
+ if (AgentCircuits.ContainsKey(circuitCode))
+ AgentCircuits.Remove(circuitCode);
}
}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 45915db83f..98d75ad253 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -538,9 +538,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
"[CLIENT]: Close has been called with shutdownCircuit = {0} for {1} attached to scene {2}",
shutdownCircuit, Name, m_scene.RegionInfo.RegionName);
- m_imageManager.Close();
+ if (m_imageManager != null)
+ m_imageManager.Close();
- m_PacketHandler.Flush();
+ if (m_PacketHandler != null)
+ m_PacketHandler.Flush();
// raise an event on the packet server to Shutdown the circuit
// Now, if we raise the event then the packet server will call this method itself, so don't try cleanup
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index bdc4490267..eb887152aa 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -443,9 +443,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy);
- m_log.DebugFormat(
- "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}",
- useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName);
+ //m_log.DebugFormat(
+ // "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}",
+ // useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName);
}
}
diff --git a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
index 5c2fc1c1c2..98536ed58d 100644
--- a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
@@ -1,245 +1,245 @@
-/*
- * 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 OpenSim 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.Collections;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Threading;
-using System.Xml;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Region.CoreModules.Communications.Local
-{
- public class LocalInterregionComms : IRegionModule, IInterregionCommsOut, IInterregionCommsIn
- {
- private bool m_enabled = false;
-
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private List m_sceneList = new List();
-
- #region Events
- public event ChildAgentUpdateReceived OnChildAgentUpdate;
-
- #endregion /* Events */
-
- #region IRegionModule
-
- public void Initialise(Scene scene, IConfigSource config)
- {
- if (m_sceneList.Count == 0)
- {
- IConfig startupConfig = config.Configs["Communications"];
-
- if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms"))
- {
- m_log.Debug("[LOCAL COMMS]: Enabling InterregionComms LocalComms module");
- m_enabled = true;
- }
- }
-
- if (!m_enabled)
- return;
-
- Init(scene);
- }
-
- public void PostInitialise()
- {
- }
-
- public void Close()
- {
- }
-
- public string Name
- {
- get { return "LocalInterregionCommsModule"; }
- }
-
- public bool IsSharedModule
- {
- get { return true; }
- }
- ///
- /// Can be called from other modules.
- ///
- ///
- public void Init(Scene scene)
- {
- if (!m_sceneList.Contains(scene))
- {
- lock (m_sceneList)
- {
- m_sceneList.Add(scene);
- if (m_enabled)
- scene.RegisterModuleInterface(this);
- scene.RegisterModuleInterface(this);
- }
-
- }
- }
-
- #endregion /* IRegionModule */
-
- #region IInterregionComms
-
- /**
- * Agent-related communications
- */
-
- public bool SendCreateChildAgent(ulong regionHandle, AgentCircuitData aCircuit)
- {
- foreach (Scene s in m_sceneList)
- {
- if (s.RegionInfo.RegionHandle == regionHandle)
- {
-// m_log.DebugFormat("[LOCAL COMMS]: Found region {0} to send SendCreateChildAgent", regionHandle);
- s.NewUserConnection(aCircuit);
- return true;
- }
- }
-
-// m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for SendCreateChildAgent", regionHandle);
- return false;
- }
-
- public bool SendChildAgentUpdate(ulong regionHandle, AgentData cAgentData)
- {
- foreach (Scene s in m_sceneList)
- {
- if (s.RegionInfo.RegionHandle == regionHandle)
- {
- //m_log.DebugFormat(
- // "[LOCAL COMMS]: Found region {0} {1} to send ChildAgentUpdate",
- // s.RegionInfo.RegionName, regionHandle);
-
- s.IncomingChildAgentDataUpdate(cAgentData);
- return true;
- }
- }
-
-// m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for ChildAgentUpdate", regionHandle);
- return false;
- }
-
- public bool SendChildAgentUpdate(ulong regionHandle, AgentPosition cAgentData)
- {
- foreach (Scene s in m_sceneList)
- {
- if (s.RegionInfo.RegionHandle == regionHandle)
- {
- //m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate");
- s.IncomingChildAgentDataUpdate(cAgentData);
- return true;
- }
- }
- //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate");
- return false;
- }
-
- public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri)
- {
- //uint x, y;
- //Utils.LongToUInts(regionHandle, out x, out y);
- //x = x / Constants.RegionSize;
- //y = y / Constants.RegionSize;
- //Console.WriteLine("\n >>> Local SendReleaseAgent " + x + "-" + y);
- foreach (Scene s in m_sceneList)
- {
- if (s.RegionInfo.RegionHandle == regionHandle)
- {
- //m_log.Debug("[LOCAL COMMS]: Found region to SendReleaseAgent");
- return s.IncomingReleaseAgent(id);
- }
- }
- //m_log.Debug("[LOCAL COMMS]: region not found in SendReleaseAgent");
- return false;
- }
-
- public bool SendCloseAgent(ulong regionHandle, UUID id)
- {
- //uint x, y;
- //Utils.LongToUInts(regionHandle, out x, out y);
- //x = x / Constants.RegionSize;
- //y = y / Constants.RegionSize;
- //Console.WriteLine("\n >>> Local SendCloseAgent " + x + "-" + y);
- foreach (Scene s in m_sceneList)
- {
- if (s.RegionInfo.RegionHandle == regionHandle)
- {
- //m_log.Debug("[LOCAL COMMS]: Found region to SendCloseAgent");
- return s.IncomingCloseAgent(id);
- }
- }
- //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent");
- return false;
- }
-
- /**
- * Object-related communications
- */
-
- public bool SendCreateObject(ulong regionHandle, ISceneObject sog)
- {
- foreach (Scene s in m_sceneList)
- {
- if (s.RegionInfo.RegionHandle == regionHandle)
- {
+/*
+ * 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 OpenSim 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.Collections;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.Reflection;
+using System.Threading;
+using System.Xml;
+using OpenMetaverse;
+using log4net;
+using Nini.Config;
+using Nwc.XmlRpc;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.Communications.Local
+{
+ public class LocalInterregionComms : IRegionModule, IInterregionCommsOut, IInterregionCommsIn
+ {
+ private bool m_enabled = false;
+
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ private List m_sceneList = new List();
+
+ #region Events
+ public event ChildAgentUpdateReceived OnChildAgentUpdate;
+
+ #endregion /* Events */
+
+ #region IRegionModule
+
+ public void Initialise(Scene scene, IConfigSource config)
+ {
+ if (m_sceneList.Count == 0)
+ {
+ IConfig startupConfig = config.Configs["Communications"];
+
+ if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms"))
+ {
+ m_log.Debug("[LOCAL COMMS]: Enabling InterregionComms LocalComms module");
+ m_enabled = true;
+ }
+ }
+
+ if (!m_enabled)
+ return;
+
+ Init(scene);
+ }
+
+ public void PostInitialise()
+ {
+ }
+
+ public void Close()
+ {
+ }
+
+ public string Name
+ {
+ get { return "LocalInterregionCommsModule"; }
+ }
+
+ public bool IsSharedModule
+ {
+ get { return true; }
+ }
+ ///
+ /// Can be called from other modules.
+ ///
+ ///
+ public void Init(Scene scene)
+ {
+ if (!m_sceneList.Contains(scene))
+ {
+ lock (m_sceneList)
+ {
+ m_sceneList.Add(scene);
+ if (m_enabled)
+ scene.RegisterModuleInterface(this);
+ scene.RegisterModuleInterface(this);
+ }
+
+ }
+ }
+
+ #endregion /* IRegionModule */
+
+ #region IInterregionComms
+
+ /**
+ * Agent-related communications
+ */
+
+ public bool SendCreateChildAgent(ulong regionHandle, AgentCircuitData aCircuit)
+ {
+ foreach (Scene s in m_sceneList)
+ {
+ if (s.RegionInfo.RegionHandle == regionHandle)
+ {
+// m_log.DebugFormat("[LOCAL COMMS]: Found region {0} to send SendCreateChildAgent", regionHandle);
+ s.NewUserConnection(aCircuit);
+ return true;
+ }
+ }
+
+// m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for SendCreateChildAgent", regionHandle);
+ return false;
+ }
+
+ public bool SendChildAgentUpdate(ulong regionHandle, AgentData cAgentData)
+ {
+ foreach (Scene s in m_sceneList)
+ {
+ if (s.RegionInfo.RegionHandle == regionHandle)
+ {
+ //m_log.DebugFormat(
+ // "[LOCAL COMMS]: Found region {0} {1} to send ChildAgentUpdate",
+ // s.RegionInfo.RegionName, regionHandle);
+
+ s.IncomingChildAgentDataUpdate(cAgentData);
+ return true;
+ }
+ }
+
+// m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for ChildAgentUpdate", regionHandle);
+ return false;
+ }
+
+ public bool SendChildAgentUpdate(ulong regionHandle, AgentPosition cAgentData)
+ {
+ foreach (Scene s in m_sceneList)
+ {
+ if (s.RegionInfo.RegionHandle == regionHandle)
+ {
+ //m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate");
+ s.IncomingChildAgentDataUpdate(cAgentData);
+ return true;
+ }
+ }
+ //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate");
+ return false;
+ }
+
+ public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri)
+ {
+ //uint x, y;
+ //Utils.LongToUInts(regionHandle, out x, out y);
+ //x = x / Constants.RegionSize;
+ //y = y / Constants.RegionSize;
+ //Console.WriteLine("\n >>> Local SendReleaseAgent " + x + "-" + y);
+ foreach (Scene s in m_sceneList)
+ {
+ if (s.RegionInfo.RegionHandle == regionHandle)
+ {
+ //m_log.Debug("[LOCAL COMMS]: Found region to SendReleaseAgent");
+ return s.IncomingReleaseAgent(id);
+ }
+ }
+ //m_log.Debug("[LOCAL COMMS]: region not found in SendReleaseAgent");
+ return false;
+ }
+
+ public bool SendCloseAgent(ulong regionHandle, UUID id)
+ {
+ //uint x, y;
+ //Utils.LongToUInts(regionHandle, out x, out y);
+ //x = x / Constants.RegionSize;
+ //y = y / Constants.RegionSize;
+ //Console.WriteLine("\n >>> Local SendCloseAgent " + x + "-" + y);
+ foreach (Scene s in m_sceneList)
+ {
+ if (s.RegionInfo.RegionHandle == regionHandle)
+ {
+ //m_log.Debug("[LOCAL COMMS]: Found region to SendCloseAgent");
+ return s.IncomingCloseAgent(id);
+ }
+ }
+ //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent");
+ return false;
+ }
+
+ /**
+ * Object-related communications
+ */
+
+ public bool SendCreateObject(ulong regionHandle, ISceneObject sog)
+ {
+ foreach (Scene s in m_sceneList)
+ {
+ if (s.RegionInfo.RegionHandle == regionHandle)
+ {
//m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject");
ISceneObject sogClone = sog.CloneForNewScene();
- return s.IncomingCreateObject(sogClone);
- }
- }
- return false;
- }
-
- #endregion /* IInterregionComms */
-
- #region Misc
-
- public UUID GetRegionID(ulong regionhandle)
- {
- foreach (Scene s in m_sceneList)
- {
- if (s.RegionInfo.RegionHandle == regionhandle)
- return s.RegionInfo.RegionID;
- }
- // ? weird. should not happen
- return m_sceneList[0].RegionInfo.RegionID;
- }
- #endregion
- }
-}
+ return s.IncomingCreateObject(sogClone);
+ }
+ }
+ return false;
+ }
+
+ #endregion /* IInterregionComms */
+
+ #region Misc
+
+ public UUID GetRegionID(ulong regionhandle)
+ {
+ foreach (Scene s in m_sceneList)
+ {
+ if (s.RegionInfo.RegionHandle == regionhandle)
+ return s.RegionInfo.RegionID;
+ }
+ // ? weird. should not happen
+ return m_sceneList[0].RegionInfo.RegionID;
+ }
+ #endregion
+ }
+}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 18245e57c4..848b49737d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2286,6 +2286,32 @@ namespace OpenSim.Region.Framework.Scenes
public override void AddNewClient(IClientAPI client)
{
+ if (m_regInfo.EstateSettings.IsBanned(client.AgentId))
+ {
+ m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
+ client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName);
+ client.SendAlertMessage("Denied access to region " + RegionInfo.RegionName + ". You have been banned from that region.");
+ try
+ {
+ IEventQueue eq = RequestModuleInterface();
+ if (eq != null)
+ {
+ eq.DisableSimulator(RegionInfo.RegionHandle, client.AgentId);
+ }
+ else
+ client.SendShutdownConnectionNotice();
+
+ client.Close(false);
+ CapsModule.RemoveCapsHandler(client.AgentId);
+ m_authenticateHandler.RemoveCircuit(client.CircuitCode);
+ }
+ catch (Exception e)
+ {
+ m_log.DebugFormat("[SCENE]: Exception while closing banned client {0} {1}: {2}", client.FirstName, client.LastName, e.Message);
+ }
+ }
+
+
SubscribeToClientEvents(client);
ScenePresence presence;
@@ -2803,7 +2829,7 @@ namespace OpenSim.Region.Framework.Scenes
if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
{
m_log.WarnFormat(
- "[CONNECTION BEGIN]: Denied access to: {0} at {1} because the user is on the region banlist",
+ "[CONNECTION BEGIN]: Incoming user {0} at {1} is on the region banlist",
agent.AgentID, RegionInfo.RegionName);
}