From 2a1b5e3540692eb90ccb943fb0aec08c14e9445b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 21 Sep 2009 14:14:22 +0100
Subject: A small fix for remote console to accommodate PollServiceArgs
 behavior a bit better

---
 OpenSim/Framework/Console/RemoteConsole.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Console')

diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 67bff4c..a005e20 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -197,7 +197,7 @@ namespace OpenSim.Framework.Console
 
             string uri = "/ReadResponses/" + sessionID.ToString() + "/";
 
-            m_Server.AddPollServiceHTTPHandler(uri, HandleHttpCloseSession,
+            m_Server.AddPollServiceHTTPHandler(uri, HandleHttpPoll,
                     new PollServiceEventArgs(HasEvents, GetEvents, NoEvents,
                     sessionID));
 
@@ -230,6 +230,11 @@ namespace OpenSim.Framework.Console
             return reply;
         }
 
+        private Hashtable HandleHttpPoll(Hashtable request)
+        {
+            return new Hashtable();
+        }
+
         private Hashtable HandleHttpCloseSession(Hashtable request)
         {
             DoExpire();
-- 
cgit v1.1


From 04170521f081bf009bf15f76451b119dc280a438 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 21 Sep 2009 14:59:31 +0100
Subject: Add a UUID param to NoEvents in PollServiceEventArgs to make it more
 generic

---
 OpenSim/Framework/Console/RemoteConsole.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Framework/Console')

diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index a005e20..5a18b94 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -393,12 +393,12 @@ namespace OpenSim.Framework.Console
             lock (m_Connections)
             {
                 if (!m_Connections.ContainsKey(sessionID))
-                    return NoEvents();
+                    return NoEvents(UUID.Zero);
                 c = m_Connections[sessionID];
             }
             c.last = System.Environment.TickCount;
             if (c.lastLineSeen >= m_LineNumber)
-                return NoEvents();
+                return NoEvents(UUID.Zero);
 
             Hashtable result = new Hashtable();
 
@@ -440,7 +440,7 @@ namespace OpenSim.Framework.Console
             return result;
         }
 
-        private Hashtable NoEvents()
+        private Hashtable NoEvents(UUID id)
         {
             Hashtable result = new Hashtable();
 
-- 
cgit v1.1


From bc9e4cfd961e6ed0184165e4f3cbb770b47a8dff Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 21 Sep 2009 18:11:40 +0100
Subject: Add a RequestID (UUID.Random()) to the PollRequest and pass it to all
 even hander delegates.

---
 OpenSim/Framework/Console/RemoteConsole.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Framework/Console')

diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 5a18b94..76276a5 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -370,7 +370,7 @@ namespace OpenSim.Framework.Console
             }
         }
 
-        private bool HasEvents(UUID sessionID)
+        private bool HasEvents(UUID RequestID, UUID sessionID)
         {
             ConsoleConnection c = null;
 
@@ -386,19 +386,19 @@ namespace OpenSim.Framework.Console
             return false;
         }
 
-        private Hashtable GetEvents(UUID sessionID, string request)
+        private Hashtable GetEvents(UUID RequestID, UUID sessionID, string request)
         {
             ConsoleConnection c = null;
 
             lock (m_Connections)
             {
                 if (!m_Connections.ContainsKey(sessionID))
-                    return NoEvents(UUID.Zero);
+                    return NoEvents(RequestID, UUID.Zero);
                 c = m_Connections[sessionID];
             }
             c.last = System.Environment.TickCount;
             if (c.lastLineSeen >= m_LineNumber)
-                return NoEvents(UUID.Zero);
+                return NoEvents(RequestID, UUID.Zero);
 
             Hashtable result = new Hashtable();
 
@@ -440,7 +440,7 @@ namespace OpenSim.Framework.Console
             return result;
         }
 
-        private Hashtable NoEvents(UUID id)
+        private Hashtable NoEvents(UUID RequestID, UUID id)
         {
             Hashtable result = new Hashtable();
 
-- 
cgit v1.1


From dafe5bf05f6d85d4140a0b733f0fbf9a5c43cf37 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 22 Sep 2009 06:19:02 +0100
Subject: Completely remove the prior implementation of the request event
 handling on poll handlers. Introduce a new delegate on the
 PollServiceEventArgs that allow access to the request headers and body.

---
 OpenSim/Framework/Console/RemoteConsole.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Console')

diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 76276a5..c27072c 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -198,7 +198,7 @@ namespace OpenSim.Framework.Console
             string uri = "/ReadResponses/" + sessionID.ToString() + "/";
 
             m_Server.AddPollServiceHTTPHandler(uri, HandleHttpPoll,
-                    new PollServiceEventArgs(HasEvents, GetEvents, NoEvents,
+                    new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents,
                     sessionID));
 
             XmlDocument xmldoc = new XmlDocument();
-- 
cgit v1.1