*Added support for reservations in OpenGridServices (mysql only for now)

*SQL file coming soon (as soon as I can figure out how to get the

8 files changed, 119 insertions, 40 deletions

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
index 92169c4..1dac4bd 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
+++ b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
@@ -181,10 +181,12 @@ namespace OpenGrid.Framework.Data.MSSQL
 

             byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);

             byte[] hash = HashProvider.ComputeHash(stream);

-

             return false;

         }

+        public ReservationData GetReservationAtPoint(uint x, uint y)

+        {

+            return null;

+        }

     }

-

-

+    

 }

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
index d9a517d..4d6cf63 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
@@ -252,6 +252,33 @@ namespace OpenGrid.Framework.Data.MySQL
 

             return false;

         }

+

+        public ReservationData GetReservationAtPoint(uint x, uint y)

+        {

+            try

+            {

+                lock (database)

+                {

+                    Dictionary<string, string> param = new Dictionary<string, string>();

+                    param["?x"] = x.ToString();

+                    param["?y"] = y.ToString();

+                    System.Data.IDbCommand result = database.Query("SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y", param);

+                    System.Data.IDataReader reader = result.ExecuteReader();

+

+                    ReservationData row = database.readReservationRow(reader);

+                    reader.Close();

+                    result.Dispose();

+

+                    return row;

+                }

+            }

+            catch (Exception e)

+            {

+                database.Reconnect();

+                Console.WriteLine(e.ToString());

+                return null;

+            }

+        }

     }

 

 

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
index 76d3faf..53b3bdd 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
@@ -241,6 +241,34 @@ namespace OpenGrid.Framework.Data.MySQL
         }

 

         /// <summary>

+        /// Reads a reservation row from a database reader

+        /// </summary>

+        /// <param name="reader">An active database reader</param>

+        /// <returns>A reservation data object</returns>

+        public ReservationData readReservationRow(IDataReader reader)

+        {

+            ReservationData retval = new ReservationData();

+            if (reader.Read())

+            {

+                retval.gridRecvKey = (string)reader["gridRecvKey"];

+                retval.gridSendKey = (string)reader["gridSendKey"];

+                retval.reservationCompany = (string)reader["resCompany"];

+                retval.reservationMaxX = (int)reader["resXMax"];

+                retval.reservationMaxY = (int)reader["resYMax"];

+                retval.reservationMinX = (int)reader["resXMin"];

+                retval.reservationMinY = (int)reader["resYMin"];

+                retval.reservationName = (string)reader["resName"];

+                retval.status = (bool)reader["status"];

+                retval.userUUID = new libsecondlife.LLUUID((string)reader["userUUID"]);

+

+            }

+            else

+            {

+                return null;

+            }

+            return retval;

+        }

+        /// <summary>

         /// Reads an agent row from a database reader

         /// </summary>

         /// <param name="reader">An active database reader</param>

diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
index 94ed46f..d7a5a69 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
@@ -184,6 +184,11 @@ namespace OpenGrid.Framework.Data.SQLite
 

             return false;

         }

+

+        public ReservationData GetReservationAtPoint(uint x, uint y)

+        {

+            return null;

+        }

     }

 

 

diff --git a/OpenGridServices/OpenGridServices.AssetServer/Main.cs b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
index 057004d..96c9dba 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
@@ -81,7 +81,7 @@ namespace OpenGridServices.AssetServer
         private OpenAsset_Main()

         {

             m_console = new LogBase("opengrid-AssetServer-console.log", "OpenAsset", this, false);

-            MainLog.Instance = m_console;

+            OpenSim.Framework.Console.MainLog.Instance = m_console;

         }

 

         public void Startup()

diff --git a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
index cfbf591..bf80652 100644
--- a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
+++ b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
@@ -392,11 +392,11 @@ namespace OpenGridServices.GridServer
                             simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToString();

 

                             // For Sugilite compatibility

-                            simProfileBlock["regionhandle"] = aSim.Value.regionHandle.ToString();

-                            simProfileBlock["sim_ip"] = aSim.Value.serverIP.ToString();

-                            simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString();

-                            simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString();

-                            simProfileBlock["uuid"] = aSim.Value.UUID.ToStringHyphenated();

+                            simProfileBlock["regionhandle"] = simProfile.regionHandle.ToString();

+                            simProfileBlock["sim_ip"] = simProfile.serverIP.ToString();

+                            simProfileBlock["sim_port"] = simProfile.serverPort.ToString();

+                            simProfileBlock["sim_uri"] = simProfile.serverURI.ToString();

+                            simProfileBlock["uuid"] = simProfile.UUID.ToStringHyphenated();

 

                             simProfileList.Add(simProfileBlock);

                         }

@@ -561,6 +561,7 @@ namespace OpenGridServices.GridServer
                 return "ERROR! Servers must register with public addresses.";

             }

 

+            

             try

             {

                 OpenSim.Framework.Console.MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");

@@ -568,9 +569,18 @@ namespace OpenGridServices.GridServer
                 {

                     try

                     {

-                        kvp.Value.AddProfile(TheSim);

-                        OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");

-                        logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid.");

+                        //Check reservations

+                        ReservationData reserveData = kvp.Value.GetReservationAtPoint(TheSim.regionLocX, TheSim.regionLocY);

+                        if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null))

+                        {

+                            kvp.Value.AddProfile(TheSim);

+                            OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");

+                            logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid.");

+                        }

+                        else

+                        {

+                            return "Unable to update region (RestSetSimMethod): Incorrect auth key.";

+                        }

                     }

                     catch (Exception e)

                     {

diff --git a/OpenGridServices/OpenGridServices.UserServer/Main.cs b/OpenGridServices/OpenGridServices.UserServer/Main.cs
index 56a3892..5c27d57 100644
--- a/OpenGridServices/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.UserServer/Main.cs
@@ -73,7 +73,7 @@ namespace OpenGridServices.UserServer
         private OpenUser_Main()

         {

             m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false);

-            MainLog.Instance = m_console;

+            OpenSim.Framework.Console.MainLog.Instance = m_console;

         }

 

         private void Work()

@@ -93,16 +93,16 @@ namespace OpenGridServices.UserServer
             this.ConfigDB(this.localXMLConfig);

             this.localXMLConfig.Close();

 

-            MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration");

+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration");

             Cfg = this.LoadConfigDll(this.ConfigDll);

             Cfg.InitConfig();

 

-            MainLog.Instance.Verbose( "Main.cs:Startup() - Establishing data connection");

+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection");

             m_userManager = new UserManager();

             m_userManager._config = Cfg;

             m_userManager.AddPlugin(StorageDll);

 

-            MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");

+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");

             BaseHttpServer httpServer = new BaseHttpServer(8002);

 

             httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);

diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
index ad0080a..32368c5 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.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>{66591469-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenGridServices.UserServer</AssemblyName>

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

     <DelaySign>false</DelaySign>

     <OutputType>Exe</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenGridServices.UserServer</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,50 +61,47 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="Db4objects.Db4o.dll" >

+    <Reference Include="Db4objects.Db4o.dll">

       <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

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

       <Private>False</Private>

     </Reference>

-    <Reference Include="OpenGrid.Framework.UserManager" >

-      <HintPath>OpenGrid.Framework.UserManager.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="OpenSim.Framework" >

+    <Reference Include="OpenSim.Framework">

       <HintPath>OpenSim.Framework.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="OpenSim.Framework.Console" >

+    <Reference Include="OpenSim.Framework.Console">

       <HintPath>OpenSim.Framework.Console.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="OpenSim.GenericConfig.Xml" >

+    <Reference Include="OpenSim.GenericConfig.Xml">

       <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="OpenSim.Servers" >

+    <Reference Include="OpenSim.Servers">

       <HintPath>OpenSim.Servers.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.Xml">

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

       <Private>False</Private>

     </Reference>

-    <Reference Include="XMLRPC" >

+    <Reference Include="XMLRPC">

       <HintPath>XMLRPC.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -108,7 +111,11 @@
       <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="..\..\Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj">

+      <Project>{DA9A7391-0000-0000-0000-000000000000}</Project>

+      <Name>OpenGrid.Framework.UserManagement</Name>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -129,4 +136,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

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