Added SandBoxManager which in sandbox mode, acts as the backend server for the CommsManager interfaces (commsManager.gridServer etc).

9 files changed, 160 insertions, 146 deletions

diff --git a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs
index eab7bac..6781806 100644
--- a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs
+++ b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs
@@ -16,7 +16,7 @@ namespace OpenGrid.Framework.Communications.GridServer
         /// </summary>

         /// <param name="regionInfo"></param>

         /// <returns></returns>

-        internal virtual RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)

+        public virtual RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)

         {

             return null;

         }

diff --git a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs
index 9e7f1e5..bf7d5b9 100644
--- a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs
+++ b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs
@@ -11,19 +11,21 @@ namespace OpenGrid.Framework.Communications.GridServer
 {

     public class GridCommsManagerLocal : GridCommsManagerBase

     {

-        public GridCommsManagerLocal()

-        {

+        private SandBoxManager sandBoxManager;

 

+        public GridCommsManagerLocal(SandBoxManager sandManager)

+        {

+            sandBoxManager = sandManager;

         }

 

-        internal override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)

+        public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)

         {

-            return null;

+            return sandBoxManager.RegisterRegion(regionInfo);

         }

 

         public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)

         {

-            return null;

+            return sandBoxManager.RequestNeighbours(regionInfo);

         }

     }

 }

diff --git a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs
index 1788873..acf8911 100644
--- a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs
+++ b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs
@@ -13,7 +13,7 @@ namespace OpenGrid.Framework.Communications.GridServer
         {

         }

 

-        internal override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)

+        public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)

         {

             return null;

         }

diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index 94682be..21a0cd7 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.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>{683344D5-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</AssemblyName>

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

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenGrid.Framework.Communications</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,18 +61,20 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Data" />

+    <Reference Include="System.Xml">

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

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

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

       <Private>False</Private>

     </Reference>

@@ -76,7 +84,7 @@
       <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>

   </ItemGroup>

   <ItemGroup>

@@ -101,6 +109,7 @@
     <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="SandBoxManager.cs" />

     <Compile Include="UserServer\UserCommsManagerBase.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -118,4 +127,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
index a6616bf..952051b 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
@@ -14,6 +14,7 @@
                 <include name="RegionServerCommsLocal.cs" />

                 <include name="RegionServerCommsManager.cs" />

                 <include name="RegionServerCommsOGS.cs" />

+                <include name="SandBoxManager.cs" />

                 <include name="GridServer/GridCommsManagerBase.cs" />

                 <include name="GridServer/GridCommsManagerLocal.cs" />

                 <include name="GridServer/GridCommsManagerOGS.cs" />

diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs
index fcccb49..bfcd15f 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs
@@ -11,117 +11,22 @@ namespace OpenGrid.Framework.Communications
 {

     public class RegionServerCommsLocal : RegionServerCommsManager

     {

-        protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>();

-        protected Dictionary<ulong, RegionCommsHostBase> regionHosts = new Dictionary<ulong, RegionCommsHostBase>();

-

+        public SandBoxManager SandManager = new SandBoxManager();

         public RegionServerCommsLocal()

         {

             userServer = new UserServer.UserCommsManagerLocal(); //Local User Server

-            gridServer = new GridServer.GridCommsManagerLocal(); //Locl Grid Server

-        }

-

-        /// <summary>

-        /// Main Register a region method with the CommsManager.

-        /// Should do anything that is needed and also call the RegisterRegion method in the gridserver class

-        /// to inform the grid server (in grid mode).

-        /// </summary>

-        /// <param name="regionInfo"></param>

-        /// <returns></returns>

-        public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)

-        {

-            //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");

-            if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle))

-            {

-                //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );

-                this.regions.Add(regionInfo.RegionHandle, regionInfo);

-                RegionCommsHostBase regionHost = new RegionCommsHostBase();

-                this.regionHosts.Add(regionInfo.RegionHandle, regionHost);

-

-                return regionHost;

-            }

-

-            //already in our list of regions so for now lets return null

-            return null;

-        }

-

-        /// <summary>

-        /// In the current class structure this shouldn't be here as it should only be in the gridserver class

-        /// but having it there in sandbox mode makes things very difficult, so for now until something is sorted out 

-        /// it will have to be here as well

-        /// </summary>

-        /// <param name="regionInfo"></param>

-        /// <returns></returns>

-        public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)

-        {

-            // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);

-            List<RegionInfo> neighbours = new List<RegionInfo>();

-

-            foreach (RegionInfo reg in this.regions.Values)

-            {

-                // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);

-                if (reg.RegionHandle != regionInfo.RegionHandle)

-                {

-                    //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");

-                    if ((reg.RegionLocX > (regionInfo.RegionLocX - 2)) && (reg.RegionLocX < (regionInfo.RegionLocX + 2)))

-                    {

-                        if ((reg.RegionLocY > (regionInfo.RegionLocY - 2)) && (reg.RegionLocY < (regionInfo.RegionLocY + 2)))

-                        {

-                            neighbours.Add(reg);

-                        }

-                    }

-                }

-            }

-            return neighbours;

+            gridServer = new GridServer.GridCommsManagerLocal(SandManager); //Locl Grid Server

         }

 

         /// <summary>

         /// informs a neighbouring sim to expect a child agent

-        /// I guess if we are going to stick with the current class structure then we need a intersim class

-        /// but think we need to really rethink the class structure as currently it makes things very messy for sandbox mode 

         /// </summary>

         /// <param name="regionHandle"></param>

         /// <param name="agentData"></param>

         /// <returns></returns>

         public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData

         {

-            //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");

-            if (this.regionHosts.ContainsKey(regionHandle))

-            {

-                // Console.WriteLine("CommsManager- Informing a region to expect child agent");

-                this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agentData);

-                return true;

-            }

-            return false;

-        }

-

-        /// <summary>

-        /// Is a Sandbox mode method, used by the local Login server to inform a region of a connection user/session

-        /// </summary>

-        /// <param name="regionHandle"></param>

-        /// <param name="loginData"></param>

-        /// <returns></returns>

-        public bool AddNewSession(ulong regionHandle, Login loginData)

-        {

-            //Console.WriteLine(" comms manager been told to expect new user");

-            AgentCircuitData agent = new AgentCircuitData();

-            agent.AgentID = loginData.Agent;

-            agent.firstname = loginData.First;

-            agent.lastname = loginData.Last;

-            agent.SessionID = loginData.Session;

-            agent.SecureSessionID = loginData.SecureSession;

-            agent.circuitcode = loginData.CircuitCode;

-            agent.BaseFolder = loginData.BaseFolder;

-            agent.InventoryFolder = loginData.InventoryFolder;

-            agent.startpos = new LLVector3(128, 128, 70);

-

-            if (this.regionHosts.ContainsKey(regionHandle))

-            {

-                this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agent);

-                return true;

-            }

-

-            // region not found

-            return false;

+            return SandManager.InformNeighbourOfChildAgent(regionHandle, agentData);

         }

     }

 }

diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
index b3a4a8f..810477a 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
@@ -20,16 +20,6 @@ namespace OpenGrid.Framework.Communications
             

         }

 

-        public virtual RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)

-        {          

-            return null;

-        }

-

-        public virtual List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)

-        {

-            return null;

-        }

-

         public virtual bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData

         {

             return false;

diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs
index b746f92..75b211d 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs
@@ -14,27 +14,9 @@ namespace OpenGrid.Framework.Communications
             gridServer = new GridServer.GridCommsManagerOGS(); //Remote Grid Server

         }

 

-        public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)

-        {

-            return gridServer.RegisterRegion(regionInfo);

-        }

-

-        /// <summary>

-        /// In the current class structure this shouldn't be here as it should only be in the gridserver class

-        /// but having it there in sandbox mode makes things very difficult, so for now until something is sorted out 

-        /// it will have to be here as well

-        /// </summary>

-        /// <param name="regionInfo"></param>

-        /// <returns></returns>

-        public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)

-        {

-            return gridServer.RequestNeighbours(regionInfo);

-        }

 

         /// <summary>

         /// informs a neighbouring sim to expect a child agent

-        /// I guess if we are going to stick with the current class structure then we need a intersim class

-        /// but think we need to really rethink the class structure as currently it makes things very messy for sandbox mode 

         /// </summary>

         /// <param name="regionHandle"></param>

         /// <param name="agentData"></param>

diff --git a/Common/OpenGrid.Framework.Communications/SandBoxManager.cs b/Common/OpenGrid.Framework.Communications/SandBoxManager.cs
new file mode 100644
index 0000000..4094658
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/SandBoxManager.cs
@@ -0,0 +1,125 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenSim.Framework;

+using OpenSim.Framework.Types;

+

+using libsecondlife;

+

+namespace OpenGrid.Framework.Communications

+{

+    public class SandBoxManager

+    {

+        protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>();

+        protected Dictionary<ulong, RegionCommsHostBase> regionHosts = new Dictionary<ulong, RegionCommsHostBase>();

+

+        public SandBoxManager()

+        {

+

+        }

+

+        /// <summary>

+        /// Main Register a region method with the CommsManager.

+        /// Should do anything that is needed and also call the RegisterRegion method in the gridserver class

+        /// to inform the grid server (in grid mode).

+        /// </summary>

+        /// <param name="regionInfo"></param>

+        /// <returns></returns>

+        public RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)

+        {

+            //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");

+            if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle))

+            {

+                //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );

+                this.regions.Add(regionInfo.RegionHandle, regionInfo);

+                RegionCommsHostBase regionHost = new RegionCommsHostBase();

+                this.regionHosts.Add(regionInfo.RegionHandle, regionHost);

+

+                return regionHost;

+            }

+

+            //already in our list of regions so for now lets return null

+            return null;

+        }

+

+        /// <summary>

+        /// In the current class structure this shouldn't be here as it should only be in the gridserver class

+        /// but having it there in sandbox mode makes things very difficult, so for now until something is sorted out 

+        /// it will have to be here as well

+        /// </summary>

+        /// <param name="regionInfo"></param>

+        /// <returns></returns>

+        public  List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)

+        {

+            // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);

+            List<RegionInfo> neighbours = new List<RegionInfo>();

+

+            foreach (RegionInfo reg in this.regions.Values)

+            {

+                // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);

+                if (reg.RegionHandle != regionInfo.RegionHandle)

+                {

+                    //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");

+                    if ((reg.RegionLocX > (regionInfo.RegionLocX - 2)) && (reg.RegionLocX < (regionInfo.RegionLocX + 2)))

+                    {

+                        if ((reg.RegionLocY > (regionInfo.RegionLocY - 2)) && (reg.RegionLocY < (regionInfo.RegionLocY + 2)))

+                        {

+                            neighbours.Add(reg);

+                        }

+                    }

+                }

+            }

+            return neighbours;

+        }

+

+        /// <summary>

+        /// informs a neighbouring sim to expect a child agent

+        /// I guess if we are going to stick with the current class structure then we need a intersim class

+        /// but think we need to really rethink the class structure as currently it makes things very messy for sandbox mode 

+        /// </summary>

+        /// <param name="regionHandle"></param>

+        /// <param name="agentData"></param>

+        /// <returns></returns>

+        public  bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData

+        {

+            //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");

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

+            {

+                // Console.WriteLine("CommsManager- Informing a region to expect child agent");

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

+                return true;

+            }

+            return false;

+        }

+

+        /// <summary>

+        /// Is a Sandbox mode method, used by the local Login server to inform a region of a connection user/session

+        /// </summary>

+        /// <param name="regionHandle"></param>

+        /// <param name="loginData"></param>

+        /// <returns></returns>

+        public bool AddNewSession(ulong regionHandle, Login loginData)

+        {

+            //Console.WriteLine(" comms manager been told to expect new user");

+            AgentCircuitData agent = new AgentCircuitData();

+            agent.AgentID = loginData.Agent;

+            agent.firstname = loginData.First;

+            agent.lastname = loginData.Last;

+            agent.SessionID = loginData.Session;

+            agent.SecureSessionID = loginData.SecureSession;

+            agent.circuitcode = loginData.CircuitCode;

+            agent.BaseFolder = loginData.BaseFolder;

+            agent.InventoryFolder = loginData.InventoryFolder;

+            agent.startpos = new LLVector3(128, 128, 70);

+

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

+            {

+                this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agent);

+                return true;

+            }

+

+            // region not found

+            return false;

+        }

+    }

+}