From 13fb582c124e173202f9cd157f8f107b67acec4b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 12 Mar 2012 07:55:17 -0700
Subject: DataSnapshot: renamed gridserverURL to gatekeeperURL, and normalimzed
 the capitalization of 'name' to lower case, also in the same <grid> section.

---
 OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/DataSnapshot/DataSnapshotManager.cs')

diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 9fc002b..209fb52 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -103,10 +103,10 @@ namespace OpenSim.Region.DataSnapshot
                         m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled);
                         IConfig conf = config.Configs["GridService"];
                         if (conf != null)
-                            m_gridinfo.Add("gridserverURL", conf.GetString("GridServerURI", "http://127.0.0.1:8003"));
+                            m_gridinfo.Add("gatekeeperURL", conf.GetString("Gatekeeper", String.Empty));
 
                         m_gridinfo.Add(
-                            "Name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo"));
+                            "name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo"));
                         m_exposure_level = config.Configs["DataSnapshot"].GetString("data_exposure", m_exposure_level);
                         m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period);
                         m_maxStales = config.Configs["DataSnapshot"].GetInt("max_changes_before_update", m_maxStales);
-- 
cgit v1.1


From 4eb2605c790857a86178bf3d170ea5a1a88f696e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 13 Mar 2012 08:06:30 -0700
Subject: Datasnapshot: added "secret" to the registration/deregistration query
 so that data providers can verify authenticity if they want.

---
 OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/DataSnapshot/DataSnapshotManager.cs')

diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 209fb52..5540656 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -66,6 +66,7 @@ namespace OpenSim.Region.DataSnapshot
         private string m_dataServices = "noservices";
         public string m_listener_port = ConfigSettings.DefaultRegionHttpPort.ToString();
         public string m_hostname = "127.0.0.1";
+        private UUID m_Secret = UUID.Random();
 
         //Update timers
         private int m_period = 20; // in seconds
@@ -85,6 +86,11 @@ namespace OpenSim.Region.DataSnapshot
             get { return m_exposure_level; }
         }
 
+        public UUID Secret
+        {
+            get { return m_Secret; }
+        }
+
         #endregion
 
         #region IRegionModule
@@ -315,6 +321,7 @@ namespace OpenSim.Region.DataSnapshot
                 cli.AddQueryParameter("service", serviceName);
                 cli.AddQueryParameter("host", m_hostname);
                 cli.AddQueryParameter("port", m_listener_port);
+                cli.AddQueryParameter("secret", m_Secret.ToString());
                 cli.RequestMethod = "GET";
                 try
                 {
@@ -341,7 +348,7 @@ namespace OpenSim.Region.DataSnapshot
                 }
                 // This is not quite working, so...
                 // string responseStr = Util.UTF8.GetString(response);
-                m_log.Info("[DATASNAPSHOT]: data service notified: " + url);
+                m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret);
             }
 
         }
-- 
cgit v1.1