diff --git a/OpenSim/Region/Environment/Modules/Communications/Interregion/IInterregionModule.cs b/OpenSim/Region/Environment/Modules/Communications/Interregion/IInterregionModule.cs new file mode 100644 index 0000000000..c15738c825 --- /dev/null +++ b/OpenSim/Region/Environment/Modules/Communications/Interregion/IInterregionModule.cs @@ -0,0 +1,14 @@ +using OpenSim.Framework; +using OpenSim.Region.Environment.Scenes; + +namespace OpenSim.Region.Environment.Modules.Communications.Interregion +{ + public interface IInterregionModule + { + void RegisterMethod(T e); + bool HasInterface(Location loc); + T RequestInterface(Location loc); + T[] RequestInterface(); + Location GetLocationByDirection(Scene scene, InterregionModule.Direction dir); + } +} \ No newline at end of file diff --git a/OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs b/OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs new file mode 100644 index 0000000000..858f099b7d --- /dev/null +++ b/OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs @@ -0,0 +1,161 @@ +using System; +using System.Collections.Generic; +using System.Runtime.Remoting; +using System.Runtime.Remoting.Channels; +using System.Runtime.Remoting.Channels.Tcp; +using Nini.Config; +using OpenSim.Framework; +using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Environment.Scenes; + +namespace OpenSim.Region.Environment.Modules.Communications.Interregion +{ + public class InterregionModule : IInterregionModule, IRegionModule + { + #region Direction enum + + public enum Direction + { + North, + NorthEast, + East, + SouthEast, + South, + SouthWest, + West, + NorthWest + } + + #endregion + + private readonly Dictionary m_interfaces = new Dictionary(); + private readonly List m_myLocations = new List(); + + private readonly Dictionary m_neighbourInterfaces = new Dictionary(); + private readonly Dictionary m_neighbourRemote = new Dictionary(); + private IConfigSource m_config; + private RemotingObject m_myRemote; + + private TcpChannel m_tcpChannel; + private int m_tcpPort = 10101; + + #region IRegionModule Members + + public void Initialise(Scene scene, IConfigSource source) + { + m_myLocations.Add(new Location((int) scene.RegionInfo.RegionLocX, + (int) scene.RegionInfo.RegionLocY)); + m_config = source; + + scene.RegisterModuleInterface(this); + } + + //TODO: This prevents us from registering new scenes after PostInitialise if we want comms updated. + public void PostInitialise() + { + try + { + m_tcpPort = m_config.Configs["Comms"].GetInt("remoting_port", m_tcpPort); + } + catch + { + } + + CreateRemotingObjects(); + } + + public void Close() + { + ChannelServices.UnregisterChannel(m_tcpChannel); + } + + public string Name + { + get { return "InterregionModule"; } + } + + public bool IsSharedModule + { + get { return true; } + } + + #endregion + + private void CreateRemotingObjects() + { + m_myRemote = new RemotingObject(m_interfaces, m_myLocations.ToArray()); + m_tcpChannel = new TcpChannel(m_tcpPort); + + ChannelServices.RegisterChannel(m_tcpChannel, false); + RemotingServices.Marshal(m_myRemote, "OpenSimRemote2", typeof (RemotingObject)); + } + + public void RegisterRemoteRegion(string uri) + { + RegisterRemotingInterface((RemotingObject) Activator.GetObject(typeof (RemotingObject), uri)); + } + + private void RegisterRemotingInterface(RemotingObject remote) + { + Location[] locs = remote.GetLocations(); + string[] interfaces = remote.GetInterfaces(); + foreach (Location loc in locs) + { + m_neighbourInterfaces[loc] = interfaces; + m_neighbourRemote[loc] = remote; + } + } + + public void RegisterMethod(T e) + { + m_interfaces[typeof (T)] = e; + } + + public bool HasInterface(Location loc) + { + foreach (string val in m_neighbourInterfaces[loc]) + { + if (val == typeof (T).FullName) + { + return true; + } + } + return false; + } + + public T RequestInterface(Location loc) + { + if (m_neighbourRemote.ContainsKey(loc)) + { + return m_neighbourRemote[loc].RequestInterface(); + } + else + { + throw new IndexOutOfRangeException("No neighbour availible at that location"); + } + } + + public T[] RequestInterface() + { + List m_t = new List(); + foreach (RemotingObject remote in m_neighbourRemote.Values) + { + try + { + m_t.Add(remote.RequestInterface()); + } + catch (NotSupportedException) + { + } + } + return m_t.ToArray(); + } + + public Location GetLocationByDirection(Scene scene, Direction dir) + { + return new Location(0, 0); + } + + //TODO: This prevents us from registering new scenes after PostInitialise if we want comms updated. + } +} \ No newline at end of file diff --git a/OpenSim/Region/Environment/Modules/Communications/Interregion/RemotingObject.cs b/OpenSim/Region/Environment/Modules/Communications/Interregion/RemotingObject.cs new file mode 100644 index 0000000000..a735677f40 --- /dev/null +++ b/OpenSim/Region/Environment/Modules/Communications/Interregion/RemotingObject.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using OpenSim.Framework; + +namespace OpenSim.Region.Environment.Modules.Communications.Interregion +{ + public class RemotingObject : MarshalByRefObject + { + private readonly Location[] m_coords; + private readonly Dictionary m_interfaces = new Dictionary(); + + public RemotingObject(Dictionary myInterfaces, Location[] coords) + { + m_interfaces = myInterfaces; + m_coords = coords; + } + + public Location[] GetLocations() + { + return (Location[]) m_coords.Clone(); + } + + public string[] GetInterfaces() + { + string[] interfaces = new string[m_interfaces.Count]; + int i = 0; + + foreach (KeyValuePair pair in m_interfaces) + { + interfaces[i++] = pair.Key.FullName; + } + + return interfaces; + } + + /// + /// Returns a registered interface availible to neighbouring regions. + /// + /// The type of interface you wish to request + /// A MarshalByRefObject inherited from this region inheriting the interface requested. + /// All registered interfaces MUST inherit from MarshalByRefObject and use only serialisable types. + public T RequestInterface() + { + if (m_interfaces.ContainsKey(typeof (T))) + return (T) m_interfaces[typeof (T)]; + + throw new NotSupportedException("No such interface registered."); + } + } +} \ No newline at end of file diff --git a/prebuild.xml b/prebuild.xml index bcef1cdd5b..d0a6e2bbf2 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -783,6 +783,7 @@ +