From 97816f8c901bf56e3b29bdbd5f8e320de352f45f Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 11 Nov 2008 17:02:46 +0000
Subject: * Implement basic region filtering as described in
 https://lists.berlios.de/pipermail/opensim-dev/2008-November/003468.html *
 This is done by sending a 'major interface version' number on sim
 registration.  Developers must increment this every time they make a change
 that would make the previous OpenSim revision failure incompatible with the
 new one (non-fatal incompatibilities are fine). * This number resides in
 OpenSim.Framework.Servers.VersionInfo.MajorInterfaceVersion * This allows the
 grid service to stop older, incompatible regions from connecting

---
 OpenSim/Grid/GridServer/GridManager.cs    | 40 ++++++++++++++++++++++++++-----
 OpenSim/Grid/GridServer/GridServerBase.cs |  2 +-
 2 files changed, 35 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Grid/GridServer')

diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 0fc2147..32b7554 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -53,6 +53,22 @@ namespace OpenSim.Grid.GridServer
         private List<MessageServerInfo> _MessageServers = new List<MessageServerInfo>();
 
         public GridConfig Config;
+        
+        /// <value>
+        /// Used to notify old regions as to which OpenSim version to upgrade to
+        /// </value>
+        private string m_opensimVersion;
+        
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="opensimVersion">
+        /// Used to notify old regions as to which OpenSim version to upgrade to
+        /// </param>
+        public GridManager(string opensimVersion)
+        {
+            m_opensimVersion = opensimVersion;
+        }
 
         /// <summary>
         /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded.
@@ -360,7 +376,7 @@ namespace OpenSim.Grid.GridServer
 
             if (!requestData.ContainsKey("UUID") || !UUID.TryParse((string)requestData["UUID"], out uuid))
             {
-                m_log.Warn("[LOGIN PRELUDE]: Region connected without a UUID, sending back error response.");
+                m_log.Debug("[LOGIN PRELUDE]: Region connected without a UUID, sending back error response.");
                 return ErrorResponse("No UUID passed to grid server - unable to connect you");
             }
 
@@ -370,21 +386,33 @@ namespace OpenSim.Grid.GridServer
             }
             catch (FormatException e)
             {
-                m_log.Warn("[LOGIN PRELUDE]: Invalid login parameters, sending back error response.");
+                m_log.Debug("[LOGIN PRELUDE]: Invalid login parameters, sending back error response.");
                 return ErrorResponse("Wrong format in login parameters. Please verify parameters." + e.ToString());
             }
+            
+            m_log.InfoFormat("[LOGIN BEGIN]: Received login request from simulator: {0}", sim.regionName);            
 
             if (!Config.AllowRegionRegistration)
             {
-                m_log.InfoFormat(
+                m_log.DebugFormat(
                     "[LOGIN END]: Disabled region registration blocked login request from simulator: {0}",
                     sim.regionName);
 
-                return ErrorResponse("The grid is currently not accepting region registrations.");
+                return ErrorResponse("This grid is currently not accepting region registrations.");
+            }            
+            
+            int majorInterfaceVersion = 0;
+            if (requestData.ContainsKey("major_interface_version"))
+                int.TryParse((string)requestData["major_interface_version"], out majorInterfaceVersion);
+            
+            if (majorInterfaceVersion != VersionInfo.MajorInterfaceVersion)
+            {
+                return ErrorResponse(
+                    String.Format(
+                        "Your region is the wrong version to connect to this grid.  Try changing to version {0} (interface version {1})",
+                        m_opensimVersion, VersionInfo.MajorInterfaceVersion));
             }
 
-            m_log.InfoFormat("[LOGIN BEGIN]: Received login request from simulator: {0}", sim.regionName);
-
             existingSim = GetRegion(sim.regionHandle);
 
             if (existingSim == null || existingSim.UUID == sim.UUID || sim.UUID != sim.originUUID)
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 36ea238..9652765 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Grid.GridServer
         protected virtual void SetupGridManager()
         {
             m_log.Info("[DATA]: Connecting to Storage Server");
-            m_gridManager = new GridManager();
+            m_gridManager = new GridManager(m_version);
             m_gridManager.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect);
             m_gridManager.Config = m_config;
         }
-- 
cgit v1.1