Merge branch 'master' into careminster-presence-refactor

1 files changed, 50 insertions, 167 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index 79b9a16..ab343c8 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -29,7 +29,6 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Text;
 
 using Nwc.XmlRpc;
 
@@ -62,7 +61,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private bool m_connectorEnabled = false;
 
-        private string m_groupsServerURI = string.Empty;
+        private string m_serviceURL = string.Empty;
 
         private bool m_disableKeepAlive = false;
 
@@ -70,17 +69,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         private string m_groupWriteKey = string.Empty;
 
         private IUserAccountService m_accountService = null;
-
-        private ExpiringCache<string, XmlRpcResponse> m_memoryCache;
-        private int m_cacheTimeout = 30;
-
-        // Used to track which agents are have dropped from a group chat session
-        // Should be reset per agent, on logon
-        // TODO: move this to Flotsam XmlRpc Service
-        // SessionID, List<AgentID>
-        private Dictionary<UUID, List<UUID>> m_groupsAgentsDroppedFromChatSession = new Dictionary<UUID, List<UUID>>();
-        private Dictionary<UUID, List<UUID>> m_groupsAgentsInvitedToChatSession = new Dictionary<UUID, List<UUID>>();
-
+        
 
         #region IRegionModuleBase Members
 
@@ -115,13 +104,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     return;
                 }
 
-                m_log.InfoFormat("[XMLRPC-GROUPS-CONNECTOR]: Initializing {0}", this.Name);
+                m_log.InfoFormat("[GROUPS-CONNECTOR]: Initializing {0}", this.Name);
 
-                m_groupsServerURI = groupsConfig.GetString("GroupsServerURI", string.Empty);
-                if ((m_groupsServerURI == null) ||
-                    (m_groupsServerURI == string.Empty))
+                m_serviceURL = groupsConfig.GetString("XmlRpcServiceURL", string.Empty);
+                if ((m_serviceURL == null) ||
+                    (m_serviceURL == string.Empty))
                 {
-                    m_log.ErrorFormat("Please specify a valid URL for GroupsServerURI in OpenSim.ini, [Groups]");
+                    m_log.ErrorFormat("Please specify a valid URL for XmlRpcServiceURL in OpenSim.ini, [Groups]");
                     m_connectorEnabled = false;
                     return;
                 }
@@ -131,26 +120,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 m_groupReadKey = groupsConfig.GetString("XmlRpcServiceReadKey", string.Empty);
                 m_groupWriteKey = groupsConfig.GetString("XmlRpcServiceWriteKey", string.Empty);
 
+                
 
-                m_cacheTimeout = groupsConfig.GetInt("GroupsCacheTimeout", 30);
-                if (m_cacheTimeout == 0)
-                {
-                    m_log.WarnFormat("[XMLRPC-GROUPS-CONNECTOR]: Groups Cache Disabled.");
-                }
-                else
-                {
-                    m_log.InfoFormat("[XMLRPC-GROUPS-CONNECTOR]: Groups Cache Timeout set to {0}.", m_cacheTimeout);
-                }
 
                 // If we got all the config options we need, lets start'er'up
-                m_memoryCache = new ExpiringCache<string, XmlRpcResponse>();
                 m_connectorEnabled = true;
             }
         }
 
         public void Close()
         {
-            m_log.InfoFormat("[XMLRPC-GROUPS-CONNECTOR]: Closing {0}", this.Name);
+            m_log.InfoFormat("[GROUPS-CONNECTOR]: Closing {0}", this.Name);
         }
 
         public void AddRegion(OpenSim.Region.Framework.Scenes.Scene scene)
@@ -776,69 +756,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             XmlRpcCall(requestingAgentID, "groups.addGroupNotice", param);
         }
-
-
-
-        #endregion
-
-        #region GroupSessionTracking
-
-        public void ResetAgentGroupChatSessions(UUID agentID)
-        {
-            foreach (List<UUID> agentList in m_groupsAgentsDroppedFromChatSession.Values)
-            {
-                agentList.Remove(agentID);
-            }
-        }
-
-        public bool hasAgentBeenInvitedToGroupChatSession(UUID agentID, UUID groupID)
-        {
-            // If we're  tracking this group, and we can find them in the tracking, then they've been invited
-            return m_groupsAgentsInvitedToChatSession.ContainsKey(groupID)
-                && m_groupsAgentsInvitedToChatSession[groupID].Contains(agentID);
-        }
-
-        public bool hasAgentDroppedGroupChatSession(UUID agentID, UUID groupID)
-        {
-            // If we're tracking drops for this group, 
-            // and we find them, well... then they've dropped
-            return m_groupsAgentsDroppedFromChatSession.ContainsKey(groupID) 
-                && m_groupsAgentsDroppedFromChatSession[groupID].Contains(agentID);
-        }
-
-        public void AgentDroppedFromGroupChatSession(UUID agentID, UUID groupID)
-        {
-            if (m_groupsAgentsDroppedFromChatSession.ContainsKey(groupID))
-            {
-                // If not in dropped list, add
-                if (!m_groupsAgentsDroppedFromChatSession[groupID].Contains(agentID))
-                {
-                    m_groupsAgentsDroppedFromChatSession[groupID].Add(agentID);
-                }
-            }
-        }
-
-        public void AgentInvitedToGroupChatSession(UUID agentID, UUID groupID)
-        {
-            // Add Session Status if it doesn't exist for this session
-            CreateGroupChatSessionTracking(groupID);
-
-            // If nessesary, remove from dropped list
-            if (m_groupsAgentsDroppedFromChatSession[groupID].Contains(agentID))
-            {
-                m_groupsAgentsDroppedFromChatSession[groupID].Remove(agentID);
-            }
-        }
-
-        private void CreateGroupChatSessionTracking(UUID groupID)
-        {
-            if (!m_groupsAgentsDroppedFromChatSession.ContainsKey(groupID))
-            {
-                m_groupsAgentsDroppedFromChatSession.Add(groupID, new List<UUID>());
-                m_groupsAgentsInvitedToChatSession.Add(groupID, new List<UUID>());
-            }
-
-        }
         #endregion
 
         #region XmlRpcHashtableMarshalling
@@ -932,84 +849,50 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         /// </summary>
         private Hashtable XmlRpcCall(UUID requestingAgentID, string function, Hashtable param)
         {
-            XmlRpcResponse resp = null;
-            string CacheKey = null;
-
-            // Only bother with the cache if it isn't disabled.
-            if (m_cacheTimeout > 0)
-            {
-                if (!function.StartsWith("groups.get"))
-                {
-                    // Any and all updates cause the cache to clear
-                    m_memoryCache.Clear();
-                }
-                else
-                {
-                    StringBuilder sb = new StringBuilder(requestingAgentID + function);
-                    foreach (object key in param.Keys)
-                    {
-                        if (param[key] != null)
-                        {
-                            sb.AppendFormat(",{0}:{1}", key.ToString(), param[key].ToString());
-                        }
-                    }
-
-                    CacheKey = sb.ToString();
-                    m_memoryCache.TryGetValue(CacheKey, out resp);
-                }
-
-            }
+            string UserService;
+            UUID SessionID;
+            GetClientGroupRequestID(requestingAgentID, out UserService, out SessionID);
+            param.Add("requestingAgentID", requestingAgentID.ToString());
+            param.Add("RequestingAgentUserService", UserService);
+            param.Add("RequestingSessionID", SessionID.ToString());
             
-            if( resp == null )
-            {
-                string UserService;
-                UUID SessionID;
-                GetClientGroupRequestID(requestingAgentID, out UserService, out SessionID);
-                param.Add("requestingAgentID", requestingAgentID.ToString());
-                param.Add("RequestingAgentUserService", UserService);
-                param.Add("RequestingSessionID", SessionID.ToString());
 
+            param.Add("ReadKey", m_groupReadKey);
+            param.Add("WriteKey", m_groupWriteKey);
 
-                param.Add("ReadKey", m_groupReadKey);
-                param.Add("WriteKey", m_groupWriteKey);
 
+            IList parameters = new ArrayList();
+            parameters.Add(param);
 
-                IList parameters = new ArrayList();
-                parameters.Add(param);
-
-                ConfigurableKeepAliveXmlRpcRequest req;
-                req = new ConfigurableKeepAliveXmlRpcRequest(function, parameters, m_disableKeepAlive);
+            ConfigurableKeepAliveXmlRpcRequest req;
+            req = new ConfigurableKeepAliveXmlRpcRequest(function, parameters, m_disableKeepAlive);
 
+            XmlRpcResponse resp = null;
 
-                try
-                {
-                    resp = req.Send(m_groupsServerURI, 10000);
+            try
+            {
+                resp = req.Send(m_serviceURL, 10000);
+            }
+            catch (Exception e)
+            {
+                
 
-                    if ((m_cacheTimeout > 0) && (CacheKey != null))
-                    {
-                        m_memoryCache.AddOrUpdate(CacheKey, resp, TimeSpan.FromSeconds(m_cacheTimeout));
-                    }
+                m_log.ErrorFormat("[XMLRPCGROUPDATA]: An error has occured while attempting to access the XmlRpcGroups server method: {0}", function);
+                m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", e.ToString());
 
+                foreach (string ResponseLine in req.RequestResponse.Split(new string[] { Environment.NewLine },StringSplitOptions.None))
+                {
+                    m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", ResponseLine);
                 }
-                catch (Exception e)
+
+                foreach (string key in param.Keys)
                 {
-                    m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: An error has occured while attempting to access the XmlRpcGroups server method: {0}", function);
-                    m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: {0} ", e.ToString());
-
-                    foreach (string ResponseLine in req.RequestResponse.Split(new string[] { Environment.NewLine }, StringSplitOptions.None))
-                    {
-                        m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: {0} ", ResponseLine);
-                    }
-
-                    foreach (string key in param.Keys)
-                    {
-                        m_log.WarnFormat("[XMLRPC-GROUPS-CONNECTOR]: {0} :: {1}", key, param[key].ToString());
-                    }
-
-                    Hashtable respData = new Hashtable();
-                    respData.Add("error", e.ToString());
-                    return respData;
+                    m_log.WarnFormat("[XMLRPCGROUPDATA]: {0} :: {1}", key, param[key].ToString());
                 }
+
+                Hashtable respData = new Hashtable();
+                respData.Add("error", e.ToString());
+                return respData;
             }
 
             if (resp.Value is Hashtable)
@@ -1023,21 +906,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 return respData;
             }
 
-            m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: The XmlRpc server returned a {1} instead of a hashtable for {0}", function, resp.Value.GetType().ToString());
+            m_log.ErrorFormat("[XMLRPCGROUPDATA]: The XmlRpc server returned a {1} instead of a hashtable for {0}", function, resp.Value.GetType().ToString());
 
             if (resp.Value is ArrayList)
             {
                 ArrayList al = (ArrayList)resp.Value;
-                m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: Contains {0} elements", al.Count);
+                m_log.ErrorFormat("[XMLRPCGROUPDATA]: Contains {0} elements", al.Count);
 
                 foreach (object o in al)
                 {
-                    m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: {0} :: {1}", o.GetType().ToString(), o.ToString());
+                    m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} :: {1}", o.GetType().ToString(), o.ToString());
                 }
             }
             else
             {
-                m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: Function returned: {0}", resp.Value.ToString());
+                m_log.ErrorFormat("[XMLRPCGROUPDATA]: Function returned: {0}", resp.Value.ToString());
             }
 
             Hashtable error = new Hashtable();
@@ -1047,16 +930,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private void LogRespDataToConsoleError(Hashtable respData)
         {
-            m_log.Error("[XMLRPC-GROUPS-CONNECTOR]: Error:");
+            m_log.Error("[XMLRPCGROUPDATA]: Error:");
 
             foreach (string key in respData.Keys)
             {
-                m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: Key: {0}", key);
+                m_log.ErrorFormat("[XMLRPCGROUPDATA]: Key: {0}", key);
 
                 string[] lines = respData[key].ToString().Split(new char[] { '\n' });
                 foreach (string line in lines)
                 {
-                    m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: {0}", line);
+                    m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0}", line);
                 }
 
             }
@@ -1065,8 +948,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         
         /// <summary>
         /// Group Request Tokens are an attempt to allow the groups service to authenticate 
-        /// requests.  
-        /// TODO: This broke after the big grid refactor, either find a better way, or discard this
+        /// requests.  Currently uses UserService, AgentID, and SessionID
+        /// TODO: Find a better way to do this.
         /// </summary>
         /// <param name="client"></param>
         /// <returns></returns>