Some very Preliminary work on .net remoting for interregion comms.

a few more classes for CAPS LLSD types.

4 files changed, 151 insertions, 30 deletions

diff --git a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
index 308e00f..563eaf7 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
@@ -7,10 +7,11 @@ namespace OpenGrid.Framework.Communications.OGS1
 {

     public class GridCommsManager : CommunicationsManager

     {

+        private OGS1GridServices gridInterComms = new OGS1GridServices();

         public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo)

         {

-            GridServer = new OGS1GridServices();

-            InterRegion = new OGSInterSimComms();

+            GridServer = gridInterComms;

+            InterRegion = gridInterComms;

             UserServer = new OGSUserServices();

         }

     }

diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
index a67f55d..db64f0c 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
+++ b/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
@@ -2,9 +2,11 @@ using System;
 using System.Collections.Generic;

 using System.Collections;

 using System.Text;

+using System.Runtime.Remoting;

+using System.Runtime.Remoting.Channels;

+using System.Runtime.Remoting.Channels.Tcp;

 

 using OpenSim.Servers;

-

 using OpenSim.Framework;

 using OpenSim.Framework.Types;

 using OpenGrid.Framework.Communications;

@@ -14,7 +16,7 @@ using libsecondlife;
 

 namespace OpenGrid.Framework.Communications.OGS1

 {

-    public class OGS1GridServices : IGridServices

+    public class OGS1GridServices : IGridServices, IInterRegionCommunications

     {

         public Dictionary<ulong, RegionCommsListener> listeners = new Dictionary<ulong, RegionCommsListener>();

         public GridInfo grid;

@@ -49,19 +51,19 @@ namespace OpenGrid.Framework.Communications.OGS1
                 string errorstring = (string)GridRespData["error"];

                 OpenSim.Framework.Console.MainLog.Instance.Error("Unable to connect to grid: " + errorstring);

                 return null;

-            }

-            

-            // Initialise the background listeners

-            listeners[regionInfo.RegionHandle] = new RegionCommsListener();

+            }  

 

-            if (!initialised)

+            if (!this.listeners.ContainsKey(regionInfo.RegionHandle))

             {

-                initialised = true;

+               // initialised = true;

                 httpListener = new BaseHttpServer(regionInfo.CommsIPListenPort);

                 httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser);

                 httpListener.Start();

             }

 

+            // Initialise the background listeners

+            listeners[regionInfo.RegionHandle] = new RegionCommsListener();

+

             return listeners[regionInfo.RegionHandle];

         }

 

@@ -182,6 +184,65 @@ namespace OpenGrid.Framework.Communications.OGS1
             return new XmlRpcResponse();

         }

 

+        #region InterRegion Comms

+        private void StartRemoting()

+        {

+            TcpChannel ch = new TcpChannel(8895);

+            ChannelServices.RegisterChannel(ch);

+

+            WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry( Type.GetType("OGS1InterRegionRemoting"), "InterRegions", WellKnownObjectMode.Singleton);

+            RemotingConfiguration.RegisterWellKnownServiceType(wellType);

+            InterRegionSingleton.Instance.OnArrival += this.IncomingArrival;

+            InterRegionSingleton.Instance.OnChildAgent += this.IncomingChildAgent;

+        }

+

+        #region Methods called by regions in this instance

+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)

+        {

+            if (this.listeners.ContainsKey(regionHandle))

+            {

+                this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);

+                return true;

+            }

+            //TODO need to see if we know about where this region is and use .net remoting 

+            // to inform it. 

+            return false;

+        }

 

+        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)

+        {

+            if (this.listeners.ContainsKey(regionHandle))

+            {

+                this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);

+                return true;

+            }

+            //TODO need to see if we know about where this region is and use .net remoting 

+            // to inform it. 

+            return false;

+        }

+        #endregion

+

+        #region Methods triggered by calls from external instances

+        public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData)

+        {

+            if (this.listeners.ContainsKey(regionHandle))

+            {

+                this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);

+                return true;

+            }

+            return false;

+        }

+

+        public bool IncomingArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)

+        {

+            if (this.listeners.ContainsKey(regionHandle))

+            {

+                this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);

+                return true;

+            }

+            return false;

+        }

+        #endregion

+        #endregion

     }

 }

diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
index 0024d14..3d74e2f 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
+++ b/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
@@ -5,15 +5,66 @@ using OpenSim.Framework.Types;
 using OpenGrid.Framework.Communications;

 namespace OpenGrid.Framework.Communications.OGS1

 {

-    public class OGSInterSimComms  : IInterRegionCommunications

+    public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);

+    public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);

+

+    public sealed class InterRegionSingleton

     {

+        static readonly InterRegionSingleton instance = new InterRegionSingleton();

+

+        public event InformRegionChild OnChildAgent;

+        public event ExpectArrival OnArrival;

+

+        static InterRegionSingleton()

+        {

+        }

+

+        InterRegionSingleton()

+        {

+        }

+

+        public static InterRegionSingleton Instance

+        {

+            get

+            {

+                return instance;

+            }

+        }

+

         public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)

         {

+            if (OnChildAgent != null)

+            {

+                return OnChildAgent(regionHandle, agentData);

+            }

             return false;

         }

+

         public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)

         {

+            if (OnArrival != null)

+            {

+                return OnArrival(regionHandle, agentID, position);

+            }

             return false;

         }

     }

+

+    public class OGS1InterRegionRemoting : MarshalByRefObject

+    {

+

+        public OGS1InterRegionRemoting()

+        {

+        }

+

+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)

+        {

+            return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);

+        }

+

+        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)

+        {

+            return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);

+        }

+    }

 }

diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
index 3f4f22d..00246e1 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
+++ b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{17442AF1-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,22 +61,24 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Data" >

+    <Reference Include="System.Data">

       <HintPath>System.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Runtime.Remoting" />

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -80,37 +88,37 @@
       <Name>OpenGrid.Framework.Communications</Name>

       <Project>{683344D5-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

       <Name>OpenGrid.Framework.Data</Name>

       <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">

       <Name>OpenSim.Framework</Name>

       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

       <Name>OpenSim.Framework.Console</Name>

       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">

       <Name>OpenSim.Servers</Name>

       <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">

       <Name>XMLRPC</Name>

       <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -137,4 +145,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file