From 280d2cbf4ab7a075b3a3d16744ba4f2b2a19c984 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Sat, 2 May 2009 16:28:30 +0000
Subject: Thank you kindly, BlueWall, for a patch that: Move json stats to
 non-published resource name Remove well-known resource name for json stats,
 creating dynamic uris with private keys and add a user configurable resource
 name for region owner usage.

---
 OpenSim/Framework/RegionInfo.cs                |  2 ++
 OpenSim/Framework/Servers/BaseOpenSimServer.cs | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index a0f536a..4c107c9 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -211,6 +211,8 @@ namespace OpenSim.Framework
         public int ProxyOffset = 0;
         public string RegionName = String.Empty;
         public string regionSecret = UUID.Random().ToString();
+        
+        public string osSecret;
 
         public UUID lastMapUUID = UUID.Zero;
         public string lastMapRefresh = "0";
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 483f8b6..e03713e 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -79,6 +79,11 @@ namespace OpenSim.Framework.Servers
         protected string m_version;
 
         protected string m_pidFile = String.Empty;
+        
+        /// <summary>
+        /// Random uuid for private data 
+        /// </summary>
+        protected string m_osSecret = String.Empty;
 
         protected BaseHttpServer m_httpServer;
         public BaseHttpServer HttpServer
@@ -95,6 +100,9 @@ namespace OpenSim.Framework.Servers
         {
             m_startuptime = DateTime.Now;
             m_version = VersionInfo.Version;
+            
+            // Random uuid for private data
+            m_osSecret = UUID.Random().ToString();
 
             m_periodicDiagnosticsTimer.Elapsed += new ElapsedEventHandler(LogDiagnostics);
             m_periodicDiagnosticsTimer.Enabled = true;
@@ -458,12 +466,18 @@ namespace OpenSim.Framework.Servers
             {
             }
         }
+        
+        public string osSecret {
+            // Secret uuid for the simulator
+            get { return m_osSecret; }
+            
+        }
 
         public string StatReport(OSHttpRequest httpRequest)
         {
             return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version );
         }
-            
+           
         protected void RemovePIDFile()
         {
             if (m_pidFile != String.Empty)
-- 
cgit v1.1