From 98f29a47c0ad63fa20d4e3fa64971d0d0a5e959c Mon Sep 17 00:00:00 2001
From: Marck
Date: Tue, 2 Nov 2010 20:00:14 +0100
Subject: Do not include hyperlinks in a random region search during a login.

Before a random region is chosen, available fallback regions are used for the login.
---
 OpenSim/Services/LLLoginService/LLLoginService.cs | 40 +++++++++++++++++------
 1 file changed, 30 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index a06476e..fcfdd1d 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Text.RegularExpressions;
@@ -427,12 +428,9 @@ namespace OpenSim.Services.LLLoginService
                     {
                         m_log.WarnFormat("[LLOGIN SERVICE]: User {0} {1} does not have a valid home and this grid does not have default locations. Attempting to find random region",
                             account.FirstName, account.LastName);
-                        defaults = m_GridService.GetRegionsByName(scopeID, "", 1);
-                        if (defaults != null && defaults.Count > 0)
-                        {
-                            region = defaults[0];
+                        region = FindAlternativeRegion(scopeID);
+                        if (region != null)
                             where = "safe";
-                        }
                     }
                 }
 
@@ -459,12 +457,9 @@ namespace OpenSim.Services.LLLoginService
                     else
                     {
                         m_log.Info("[LLOGIN SERVICE]: Last Region Not Found Attempting to find random region");
-                        defaults = m_GridService.GetRegionsByName(scopeID, "", 1);
-                        if (defaults != null && defaults.Count > 0)
-                        {
-                            region = defaults[0];
+                        region = FindAlternativeRegion(scopeID);
+                        if (region != null)
                             where = "safe";
-                        }
                     }
 
                 }
@@ -564,6 +559,31 @@ namespace OpenSim.Services.LLLoginService
 
         }
 
+        private GridRegion FindAlternativeRegion(UUID scopeID)
+        {
+            List<GridRegion> hyperlinks = null;
+            List<GridRegion> regions = m_GridService.GetFallbackRegions(scopeID, 1000 * (int)Constants.RegionSize, 1000 * (int)Constants.RegionSize);
+            if (regions != null && regions.Count > 0)
+            {
+                hyperlinks = m_GridService.GetHyperlinks(scopeID);
+                IEnumerable<GridRegion> availableRegions = regions.Except(hyperlinks);
+                if (availableRegions.Count() > 0)
+                    return availableRegions.ElementAt(0);
+            }
+            // No fallbacks, try to find an arbitrary region that is not a hyperlink
+            // maxNumber is fixed for now; maybe use some search pattern with increasing maxSize here?
+            regions = m_GridService.GetRegionsByName(scopeID, "", 10);
+            if (regions != null && regions.Count > 0)
+            {
+                if (hyperlinks == null)
+                    hyperlinks = m_GridService.GetHyperlinks(scopeID);
+                IEnumerable<GridRegion> availableRegions = regions.Except(hyperlinks);
+                if (availableRegions.Count() > 0)
+                    return availableRegions.ElementAt(0);
+            }
+            return null;
+        }
+
         private GridRegion FindForeignRegion(string domainName, uint port, string regionName, out GridRegion gatekeeper)
         {
             gatekeeper = new GridRegion();
-- 
cgit v1.1


From 7bb005b0d1a5ae63ca94a3a3f8ad98e0388ea76b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 16 Nov 2010 21:01:56 +0000
Subject: Change the way attachments are persisted. Editing a worn attachment
 will now save properly, as will the results of a resizer script working.
 Attachment positions are no longer saved on each move, but instead are saved
 once on logout. Attachment script states are saved as part of the attachment
 now when detaching.

---
 OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 502fc82..67647ee 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -549,6 +549,7 @@ namespace OpenSim.Services.Connectors.Simulation
             OSDMap args = new OSDMap(2);
             args["sog"] = OSD.FromString(sog.ToXml2());
             args["extra"] = OSD.FromString(sog.ExtraToXmlString());
+            args["modified"] = OSD.FromBoolean(sog.HasGroupChanged);
             string state = sog.GetStateSnapshot();
             if (state.Length > 0)
                 args["state"] = OSD.FromString(state);
-- 
cgit v1.1


From c0ccfeebe78dc1d0136f86e5f0e9562c4804cfa9 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 21 Nov 2010 20:59:01 +0000
Subject: Start implementing Freeswitch in ROBUST

---
 .../FreeswitchService/FreeswitchService.cs         | 12 ++++++--
 .../FreeswitchService/FreeswitchServiceBase.cs     | 36 +++++++++++++++++++++-
 OpenSim/Services/Interfaces/IFreeswitchService.cs  |  4 ++-
 3 files changed, 48 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
index 0a38300..109ef9b 100644
--- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs
+++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
@@ -33,19 +33,27 @@ using OpenSim.Framework;
 using OpenSim.Data;
 using OpenSim.Services.Interfaces;
 using OpenMetaverse;
+using System.Collections;
 
 namespace OpenSim.Services.FreeswitchService
 {
     public class FreeswitchService : FreeswitchServiceBase, IFreeswitchService
     {
-        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public FreeswitchService(IConfigSource config) : base(config)
         {
             // Perform initilialization here
         }
 
+        public Hashtable HandleDirectoryRequest(Hashtable requestBody)
+        {
+            return new Hashtable();
+        }
 
-        // Implement IFreeswitchService here
+        public Hashtable HandleDialplanRequest(Hashtable requestBody)
+        {
+            return new Hashtable();
+        }
     }
 }
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs b/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs
index 83fecef..ebbb1b0 100644
--- a/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs
+++ b/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs
@@ -31,11 +31,28 @@ using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.Base;
+using log4net;
 
 namespace OpenSim.Services.FreeswitchService
 {
     public class FreeswitchServiceBase : ServiceBase
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected string m_freeSwitchRealm;
+        protected string m_freeSwitchSIPProxy;
+        protected bool m_freeSwitchAttemptUseSTUN = false;
+        protected string m_freeSwitchEchoServer;
+        protected int m_freeSwitchEchoPort = 50505;
+        protected string m_freeSwitchDefaultWellKnownIP;
+        protected int m_freeSwitchDefaultTimeout = 5000;
+        protected string m_freeSwitchContext = "default";
+        protected string m_freeSwitchServerUser = "freeswitch";
+        protected string m_freeSwitchServerPass = "password";
+        protected readonly string m_freeSwitchAPIPrefix = "/fsapi";
+
+        protected bool m_Enabled = false;
+
         public FreeswitchServiceBase(IConfigSource config) : base(config)
         {
             //
@@ -44,7 +61,24 @@ namespace OpenSim.Services.FreeswitchService
             IConfig freeswitchConfig = config.Configs["FreeswitchService"];
             if (freeswitchConfig != null)
             {
-                // Read config here !!
+                m_freeSwitchDefaultWellKnownIP = freeswitchConfig.GetString("ServerAddress", String.Empty);
+                if (m_freeSwitchDefaultWellKnownIP == String.Empty)
+                {
+                    m_log.Error("[FREESWITCH]: No FreeswitchServerAddress given, can't continue");
+                    return;
+                }
+
+                m_freeSwitchRealm = freeswitchConfig.GetString("Realm", m_freeSwitchDefaultWellKnownIP);
+                m_freeSwitchSIPProxy = freeswitchConfig.GetString("SIPProxy", m_freeSwitchDefaultWellKnownIP + ":5060");
+                m_freeSwitchEchoServer = freeswitchConfig.GetString("EchoServer", m_freeSwitchDefaultWellKnownIP);
+                m_freeSwitchEchoPort = freeswitchConfig.GetInt("EchoPort", m_freeSwitchEchoPort);
+                m_freeSwitchAttemptUseSTUN = freeswitchConfig.GetBoolean("AttemptSTUN", false); // This may not work
+                m_freeSwitchDefaultTimeout = freeswitchConfig.GetInt("DefaultTimeout", m_freeSwitchDefaultTimeout);
+                m_freeSwitchContext = freeswitchConfig.GetString("Context", m_freeSwitchContext);
+                m_freeSwitchServerUser = freeswitchConfig.GetString("UserName", m_freeSwitchServerUser);
+                m_freeSwitchServerPass = freeswitchConfig.GetString("Password", m_freeSwitchServerPass);
+
+                m_Enabled = true;
             }
         }
     }
diff --git a/OpenSim/Services/Interfaces/IFreeswitchService.cs b/OpenSim/Services/Interfaces/IFreeswitchService.cs
index d1f635b..2b3ffeb 100644
--- a/OpenSim/Services/Interfaces/IFreeswitchService.cs
+++ b/OpenSim/Services/Interfaces/IFreeswitchService.cs
@@ -27,11 +27,13 @@
 
 using System;
 using OpenSim.Framework;
+using System.Collections;
 
 namespace OpenSim.Services.Interfaces
 {
     public interface IFreeswitchService
     {
-        // Place anything the connector eeds to access here!
+        Hashtable HandleDirectoryRequest(Hashtable requestBody);
+        Hashtable HandleDialplanRequest(Hashtable requestBody);
     }
 }
-- 
cgit v1.1


From ed5f91c638d39938bfca04319434e007fcad90b2 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 21 Nov 2010 21:18:03 +0000
Subject: Move Dialplan and Directory from the region module to the ROBUST
 server

---
 .../FreeswitchService/FreeswitchService.cs         | 337 ++++++++++++++++++++-
 1 file changed, 333 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
index 109ef9b..b62a65a 100644
--- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs
+++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Text;
 using System.Reflection;
 using Nini.Config;
 using log4net;
@@ -46,14 +47,342 @@ namespace OpenSim.Services.FreeswitchService
             // Perform initilialization here
         }
 
-        public Hashtable HandleDirectoryRequest(Hashtable requestBody)
+        public Hashtable HandleDialplanRequest(Hashtable request)
         {
-            return new Hashtable();
+            m_log.DebugFormat("[FreeSwitchVoice] HandleDialplanRequest called with {0}",request.ToString());
+
+            Hashtable response = new Hashtable();
+
+            foreach (DictionaryEntry item in request)
+            {
+               m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}",item.Key, item.Value);
+            }
+
+            string requestcontext = (string) request["Hunt-Context"];
+            response["content_type"] = "text/xml";
+            response["keepalive"] = false;
+            response["int_response_code"] = 200;
+
+            if (m_freeSwitchContext != String.Empty && m_freeSwitchContext != requestcontext)
+            {
+                m_log.Debug("[FreeSwitchDirectory] returning empty as it's for another context");
+                response["str_response_string"] = "";
+            }
+            else
+            {
+                response["str_response_string"] = String.Format(@"<?xml version=""1.0"" encoding=""utf-8""?>
+                   <document type=""freeswitch/xml"">
+                     <section name=""dialplan"">
+                     <context name=""{0}"">" + 
+
+/*                           <!-- dial via SIP uri -->
+                            <extension name=""sip_uri"">
+                                   <condition field=""destination_number"" expression=""^sip:(.*)$"">
+                                   <action application=""bridge"" data=""sofia/${use_profile}/$1""/>
+                                   <!--<action application=""bridge"" data=""$1""/>-->
+                                   </condition>
+                           </extension>*/
+
+                           @"<extension name=""opensim_conferences"">
+                                   <condition field=""destination_number"" expression=""^confctl-(.*)$"">
+                                           <action application=""answer""/>
+                                           <action application=""conference"" data=""$1-{1}@{0}""/>
+                                   </condition>
+                           </extension>
+
+                           <extension name=""opensim_conf"">
+                                   <condition field=""destination_number"" expression=""^conf-(.*)$"">
+                                           <action application=""answer""/>
+                                           <action application=""conference"" data=""$1-{1}@{0}""/>
+                                   </condition>
+                           </extension>
+
+                           <extension name=""avatar"">
+                                   <condition field=""destination_number"" expression=""^(x.*)$"">
+                                           <action application=""bridge"" data=""user/$1""/>
+                                   </condition>
+                           </extension>
+
+                     </context>
+                   </section>
+                   </document>", m_freeSwitchContext, m_freeSwitchRealm);
+            }
+
+            return response;
         }
 
-        public Hashtable HandleDialplanRequest(Hashtable requestBody)
+        public Hashtable HandleDirectoryRequest(Hashtable request)
+        {
+            Hashtable response = new Hashtable();
+            string domain = (string) request["domain"];
+            if (domain != m_freeSwitchRealm) {
+                response["content_type"] = "text/xml";
+                response["keepalive"] = false;
+                response["int_response_code"] = 200;
+                response["str_response_string"] = "";
+            } else {
+                 m_log.DebugFormat("[FreeSwitchDirectory] HandleDirectoryRequest called with {0}",request.ToString());
+            
+                 // information in the request we might be interested in
+             
+                 // Request 1 sip_auth for users account
+             
+                 //Event-Calling-Function=sofia_reg_parse_auth
+                 //Event-Calling-Line-Number=1494
+                 //action=sip_auth
+                 //sip_user_agent=Vivox-SDK-2.1.3010.6151-Mac%20(Feb-11-2009/16%3A42%3A41)
+                 //sip_auth_username=xhZuXKmRpECyr2AARJYyGgg%3D%3D  (==)
+                 //sip_auth_realm=9.20.151.43
+                 //sip_contact_user=xhZuXKmRpECyr2AARJYyGgg%3D%3D (==)
+                 //sip_contact_host=192.168.0.3    // this shouldnt really be a local IP, investigate STUN servers
+                 //sip_to_user=xhZuXKmRpECyr2AARJYyGgg%3D%3D
+                 //sip_to_host=9.20.151.43
+                 //sip_auth_method=REGISTER
+                 //user=xhZuXKmRpECyr2AARJYyGgg%3D%3D
+                 //domain=9.20.151.43
+                 //ip=9.167.220.137    // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup
+             
+                 foreach (DictionaryEntry item in request)
+                 {
+                    m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}", item.Key, item.Value);
+                 }
+             
+                 string eventCallingFunction = (string) request["Event-Calling-Function"];
+                 if (eventCallingFunction == null)
+                 {
+                     eventCallingFunction = "sofia_reg_parse_auth";
+                 }
+
+                 if (eventCallingFunction.Length == 0)
+                 {
+                     eventCallingFunction = "sofia_reg_parse_auth";
+                 }
+             
+                 if (eventCallingFunction == "sofia_reg_parse_auth")
+                 {
+                     string sipAuthMethod = (string)request["sip_auth_method"];
+                 
+                     if (sipAuthMethod == "REGISTER")
+                     {
+                         response = HandleRegister(m_freeSwitchContext, m_freeSwitchRealm, request);
+                     } 
+                     else if (sipAuthMethod == "INVITE")
+                     {
+                          response = HandleInvite(m_freeSwitchContext, m_freeSwitchRealm, request);
+                     }
+                     else
+                     {
+                         m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown sip_auth_method {0}",sipAuthMethod);
+                         response["int_response_code"] = 404;
+                         response["content_type"] = "text/xml";
+                         response["str_response_string"] = "";
+                     }
+                 }
+                 else if (eventCallingFunction == "switch_xml_locate_user")
+                 {
+                     response = HandleLocateUser(m_freeSwitchRealm, request);
+                 }
+                 else if (eventCallingFunction == "user_data_function") // gets called when an avatar to avatar call is made
+                 {
+                      response = HandleLocateUser(m_freeSwitchRealm, request);
+                 }
+                 else if (eventCallingFunction == "user_outgoing_channel")
+                 {
+                     response = HandleRegister(m_freeSwitchContext, m_freeSwitchRealm, request);
+                 }
+                 else if (eventCallingFunction == "config_sofia") // happens once on freeswitch startup
+                 {
+                     response = HandleConfigSofia(m_freeSwitchContext, m_freeSwitchRealm, request);
+                 }
+                 else if (eventCallingFunction == "switch_load_network_lists")
+                 {
+                     //response = HandleLoadNetworkLists(request);
+                     response["int_response_code"] = 404;
+                     response["keepalive"] = false;
+                     response["content_type"] = "text/xml";
+                     response["str_response_string"] = "";
+                 }
+                 else
+                 {
+                     m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown Event-Calling-Function {0}",eventCallingFunction);
+                     response["int_response_code"] = 404;
+                     response["keepalive"] = false;
+                     response["content_type"] = "text/xml";
+                     response["str_response_string"] = "";
+                 }
+            }
+            return response;
+        }
+        
+        private Hashtable HandleRegister(string Context, string Realm, Hashtable request)
+        {
+            m_log.Info("[FreeSwitchDirectory] HandleRegister called");
+            
+            // TODO the password we return needs to match that sent in the request, this is hard coded for now
+            string password = "1234";
+            string domain = (string) request["domain"];
+            string user = (string) request["user"];
+            
+            Hashtable response = new Hashtable();
+            response["content_type"] = "text/xml";
+            response["keepalive"] = false;
+            response["int_response_code"] = 200;
+
+            response["str_response_string"] = String.Format(
+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
+                "<document type=\"freeswitch/xml\">\r\n" +
+                    "<section name=\"directory\" description=\"User Directory\">\r\n" +
+                        "<domain name=\"{0}\">\r\n" +
+                            "<user id=\"{1}\">\r\n" +
+                                "<params>\r\n" +
+                                    "<param name=\"password\" value=\"{2}\" />\r\n" +
+                                    "<param name=\"dial-string\" value=\"{{sip_contact_user={1}}}{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" +
+                                "</params>\r\n" +
+                                "<variables>\r\n" +
+                                    "<variable name=\"user_context\" value=\"{3}\" />\r\n" +
+                                    "<variable name=\"presence_id\" value=\"{1}@{0}\"/>"+
+                                "</variables>\r\n" +
+                            "</user>\r\n" +
+                        "</domain>\r\n" +
+                    "</section>\r\n" +
+                "</document>\r\n",
+                domain , user, password, Context);
+                
+            return response;
+        }
+        
+        private Hashtable HandleInvite(string Context, string Realm, Hashtable request)
+        {
+            m_log.Info("[FreeSwitchDirectory] HandleInvite called");
+            
+            // TODO the password we return needs to match that sent in the request, this is hard coded for now
+            string password = "1234";
+            string domain = (string) request["domain"];
+            string user = (string) request["user"];
+            string sipRequestUser = (string) request["sip_request_user"];
+            
+            Hashtable response = new Hashtable();
+            response["content_type"] = "text/xml";
+            response["keepalive"] = false;
+            response["int_response_code"] = 200;
+            response["str_response_string"] = String.Format(
+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
+                "<document type=\"freeswitch/xml\">\r\n" +
+                    "<section name=\"directory\" description=\"User Directory\">\r\n" +
+                        "<domain name=\"{0}\">\r\n" +
+                            "<user id=\"{1}\">\r\n" +
+                                "<params>\r\n" +
+                                    "<param name=\"password\" value=\"{2}\" />\r\n" +
+                                    "<param name=\"dial-string\" value=\"{{sip_contact_user={1}}}{{presence_id=${1}@${{dialed_domain}}}}${{sofia_contact(${1}@${{dialed_domain}})}}\"/>\r\n" +
+                                "</params>\r\n" +
+                                "<variables>\r\n" +
+                                    "<variable name=\"user_context\" value=\"{4}\" />\r\n" +
+                                    "<variable name=\"presence_id\" value=\"{1}@$${{domain}}\"/>"+
+                                "</variables>\r\n" +
+                            "</user>\r\n" +
+                            "<user id=\"{3}\">\r\n" +
+                                "<params>\r\n" +
+                                    "<param name=\"password\" value=\"{2}\" />\r\n" +
+                                    "<param name=\"dial-string\" value=\"{{sip_contact_user={1}}}{{presence_id=${3}@${{dialed_domain}}}}${{sofia_contact(${3}@${{dialed_domain}})}}\"/>\r\n" +
+                                "</params>\r\n" +
+                                "<variables>\r\n" +
+                                    "<variable name=\"user_context\" value=\"{4}\" />\r\n" +
+                                    "<variable name=\"presence_id\" value=\"{3}@$${{domain}}\"/>"+
+                                "</variables>\r\n" +
+                            "</user>\r\n" +
+                        "</domain>\r\n" +
+                    "</section>\r\n" +
+                "</document>\r\n",
+                domain , user, password,sipRequestUser, Context);
+                
+            return response;
+        }
+
+        private Hashtable HandleLocateUser(String Realm, Hashtable request)
+        {
+            m_log.Info("[FreeSwitchDirectory] HandleLocateUser called");
+            
+            // TODO the password we return needs to match that sent in the request, this is hard coded for now
+            string domain = (string) request["domain"];
+            string user = (string) request["user"];
+            
+            Hashtable response = new Hashtable();
+            response["content_type"] = "text/xml";
+            response["keepalive"] = false;
+            response["int_response_code"] = 200;
+            response["str_response_string"] = String.Format(
+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
+                "<document type=\"freeswitch/xml\">\r\n" +
+                    "<section name=\"directory\" description=\"User Directory\">\r\n" +
+                        "<domain name=\"{0}\">\r\n" +
+                            "<params>\r\n" +
+                                "<param name=\"dial-string\" value=\"{{sip_contact_user=${{dialed_user}}}}{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" +
+                            "</params>\r\n" +
+                            "<user id=\"{1}\">\r\n" +
+                            "<variables>\r\n"+
+                              "<variable name=\"default_gateway\" value=\"$${{default_provider}}\"/>\r\n"+
+                              "<variable name=\"presence_id\" value=\"{1}@$${{domain}}\"/>"+
+                            "</variables>\r\n"+
+                            "</user>\r\n" +
+                        "</domain>\r\n" +
+                    "</section>\r\n" +
+                "</document>\r\n",
+                domain , user);
+            
+            return response;
+        }
+       
+        private Hashtable HandleConfigSofia(string Context, string Realm, Hashtable request)
         {
-            return new Hashtable();
+            m_log.Info("[FreeSwitchDirectory] HandleConfigSofia called");
+            
+            // TODO the password we return needs to match that sent in the request, this is hard coded for now
+            string domain = (string) request["domain"];
+            
+            Hashtable response = new Hashtable();
+            response["content_type"] = "text/xml";
+            response["keepalive"] = false;
+            response["int_response_code"] = 200;
+            response["str_response_string"] = String.Format(
+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
+                "<document type=\"freeswitch/xml\">\r\n" +
+                    "<section name=\"directory\" description=\"User Directory\">\r\n" +
+                        "<domain name=\"{0}\">\r\n" +
+                            "<params>\r\n" +
+                                "<param name=\"dial-string\" value=\"{{sip_contact_user=${{dialed_user}}}}{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" +
+                            "</params>\r\n" +
+                            "<groups name=\"default\">\r\n"+
+                                "<users>\r\n"+
+                                    "<user id=\"$${{default_provider}}\">\r\n"+
+                                        "<gateways>\r\n"+
+                                          "<gateway name=\"$${{default_provider}}\">\r\n"+
+                                            "<param name=\"username\" value=\"$${{default_provider_username}}\"/>\r\n"+
+                                            "<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+
+                                            "<param name=\"from-user\" value=\"$${{default_provider_username}}\"/>\r\n"+
+                                            "<param name=\"from-domain\" value=\"$${{default_provider_from_domain}}\"/>\r\n"+
+                                            "<param name=\"expire-seconds\" value=\"600\"/>\r\n"+
+                                            "<param name=\"register\" value=\"$${{default_provider_register}}\"/>\r\n"+
+                                            "<param name=\"retry-seconds\" value=\"30\"/>\r\n"+
+                                            "<param name=\"extension\" value=\"$${{default_provider_contact}}\"/>\r\n"+
+                                            "<param name=\"contact-params\" value=\"domain_name=$${{domain}}\"/>\r\n"+
+                                            "<param name=\"context\" value=\"{1}\"/>\r\n"+
+                                          "</gateway>\r\n"+
+                                        "</gateways>\r\n"+
+                                        "<params>\r\n"+
+                                          "<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+
+                                        "</params>\r\n"+
+                                      "</user>\r\n"+
+                                "</users>"+
+                            "</groups>\r\n" +
+                            "<variables>\r\n"+
+                              "<variable name=\"default_gateway\" value=\"$${{default_provider}}\"/>\r\n"+
+                            "</variables>\r\n"+
+                        "</domain>\r\n" +
+                    "</section>\r\n" +
+                "</document>\r\n", 
+                domain, Context); 
+             
+            return response;
         }
     }
 }
-- 
cgit v1.1


From 2b0ef9ad1d46d89e01bc9149c8689aaa0b412587 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 21 Nov 2010 22:17:25 +0000
Subject: Implement a method to allow regions to query the gridwide Freeswitch
 configuration from ROBUST

---
 .../Services/FreeswitchService/FreeswitchService.cs  | 20 ++++++++++++++++++++
 OpenSim/Services/Interfaces/IFreeswitchService.cs    |  1 +
 2 files changed, 21 insertions(+)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
index b62a65a..21518f3 100644
--- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs
+++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
@@ -34,6 +34,7 @@ using OpenSim.Framework;
 using OpenSim.Data;
 using OpenSim.Services.Interfaces;
 using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 using System.Collections;
 
 namespace OpenSim.Services.FreeswitchService
@@ -384,5 +385,24 @@ namespace OpenSim.Services.FreeswitchService
              
             return response;
         }
+
+        public string GetJsonConfig()
+        {
+            OSDMap map = new OSDMap(11);
+
+            map.Add("Realm", m_freeSwitchRealm);
+            map.Add("SIPProxy", m_freeSwitchSIPProxy);
+            map.Add("AttemptUseSTUN", m_freeSwitchAttemptUseSTUN);
+            map.Add("EchoServer", m_freeSwitchEchoServer);
+            map.Add("EchoPort", m_freeSwitchEchoPort);
+            map.Add("DefaultWellKnownIP", m_freeSwitchDefaultWellKnownIP);
+            map.Add("DefaultTimeout", m_freeSwitchDefaultTimeout);
+            map.Add("Context", m_freeSwitchContext);
+            map.Add("ServerUser", m_freeSwitchServerUser);
+            map.Add("ServerPass", m_freeSwitchServerPass);
+            map.Add("APIPrefix", m_freeSwitchAPIPrefix);
+
+            return OSDParser.SerializeJsonString(map);
+        }
     }
 }
diff --git a/OpenSim/Services/Interfaces/IFreeswitchService.cs b/OpenSim/Services/Interfaces/IFreeswitchService.cs
index 2b3ffeb..e7941d5 100644
--- a/OpenSim/Services/Interfaces/IFreeswitchService.cs
+++ b/OpenSim/Services/Interfaces/IFreeswitchService.cs
@@ -35,5 +35,6 @@ namespace OpenSim.Services.Interfaces
     {
         Hashtable HandleDirectoryRequest(Hashtable requestBody);
         Hashtable HandleDialplanRequest(Hashtable requestBody);
+        string GetJsonConfig();
     }
 }
-- 
cgit v1.1


From a7174cecdd1724e8c8fa2f24355cb4ef380d5bf7 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 21 Nov 2010 22:45:04 +0000
Subject: Remove username and password from the publicly accessible FS config

---
 OpenSim/Services/FreeswitchService/FreeswitchService.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
index 21518f3..fe6f5cd 100644
--- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs
+++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
@@ -388,7 +388,7 @@ namespace OpenSim.Services.FreeswitchService
 
         public string GetJsonConfig()
         {
-            OSDMap map = new OSDMap(11);
+            OSDMap map = new OSDMap(9);
 
             map.Add("Realm", m_freeSwitchRealm);
             map.Add("SIPProxy", m_freeSwitchSIPProxy);
@@ -398,8 +398,6 @@ namespace OpenSim.Services.FreeswitchService
             map.Add("DefaultWellKnownIP", m_freeSwitchDefaultWellKnownIP);
             map.Add("DefaultTimeout", m_freeSwitchDefaultTimeout);
             map.Add("Context", m_freeSwitchContext);
-            map.Add("ServerUser", m_freeSwitchServerUser);
-            map.Add("ServerPass", m_freeSwitchServerPass);
             map.Add("APIPrefix", m_freeSwitchAPIPrefix);
 
             return OSDParser.SerializeJsonString(map);
-- 
cgit v1.1


From c85e6bc36dc08919141c446b0ae8d1f47eb779fb Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 21 Nov 2010 23:41:56 +0000
Subject: Add the remote connector for freeswitch config retrieval

---
 .../Freeswitch/RemoteFreeswitchConnector.cs        | 103 +++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs b/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs
new file mode 100644
index 0000000..d63d99d
--- /dev/null
+++ b/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using log4net;
+using System;
+using System.IO;
+using System.Collections;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using OpenSim.Server.Base;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Connectors
+{
+    public class RemoteFreeswitchConnector : IFreeswitchService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_ServerURI = String.Empty;
+
+        public RemoteFreeswitchConnector()
+        {
+        }
+
+        public RemoteFreeswitchConnector(string serverURI)
+        {
+            m_ServerURI = Path.Combine(serverURI.TrimEnd('/'), "region-config");
+        }
+
+        public RemoteFreeswitchConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public virtual void Initialise(IConfigSource source)
+        {
+            IConfig freeswitchConfig = source.Configs["FreeSwitchVoice"];
+            if (freeswitchConfig == null)
+            {
+                m_log.Error("[FREESWITCH CONNECTOR]: FreeSwitchVoice missing from OpenSim.ini");
+                throw new Exception("Freeswitch connector init error");
+            }
+
+            string serviceURI = freeswitchConfig.GetString("FreeswitchServiceURL",
+                    String.Empty);
+
+            if (serviceURI == String.Empty)
+            {
+                m_log.Error("[FREESWITCH CONNECTOR]: No FreeswitchServiceURL named in section FreeSwitchVoice");
+                throw new Exception("Freeswitch connector init error");
+            }
+            m_ServerURI = serviceURI;
+        }
+
+        public Hashtable HandleDirectoryRequest(Hashtable requestBody)
+        {
+            // not used here
+            return new Hashtable();
+        }
+
+        public Hashtable HandleDialplanRequest(Hashtable requestBody)
+        {
+            // not used here
+            return new Hashtable();
+        }
+
+        public string GetJsonConfig()
+        {
+            return SynchronousRestFormsRequester.MakeRequest("GET",
+                    m_ServerURI, String.Empty);
+        }
+    }
+}
-- 
cgit v1.1


From ddf08276f1c01f3d5f85ee3077062ca5d6a8a812 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 22 Nov 2010 00:55:11 +0100
Subject: Fox the buglets in Freeswitch. Grid mode works now and there is no
 reason why standalone should not.

---
 OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs b/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs
index d63d99d..c9bba0b 100644
--- a/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs
+++ b/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Services.Connectors
 
         public RemoteFreeswitchConnector(string serverURI)
         {
-            m_ServerURI = Path.Combine(serverURI.TrimEnd('/'), "region-config");
+            m_ServerURI = serverURI.TrimEnd('/') + "/region-config";
         }
 
         public RemoteFreeswitchConnector(IConfigSource source)
@@ -79,7 +79,7 @@ namespace OpenSim.Services.Connectors
                 m_log.Error("[FREESWITCH CONNECTOR]: No FreeswitchServiceURL named in section FreeSwitchVoice");
                 throw new Exception("Freeswitch connector init error");
             }
-            m_ServerURI = serviceURI;
+            m_ServerURI = serviceURI.TrimEnd('/') + "/region-config";
         }
 
         public Hashtable HandleDirectoryRequest(Hashtable requestBody)
@@ -96,6 +96,7 @@ namespace OpenSim.Services.Connectors
 
         public string GetJsonConfig()
         {
+            m_log.DebugFormat("[FREESWITCH CONNECTOR]: Requesting config from {0}", m_ServerURI);
             return SynchronousRestFormsRequester.MakeRequest("GET",
                     m_ServerURI, String.Empty);
         }
-- 
cgit v1.1


From c617d658dda92ad97de678d477a98c3df0659303 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Nov 2010 17:19:24 -0800
Subject: Added creator info across the board -- TaskInventoryItems and
 InventoryItems themselves. Tested. Seems to be working, main tests pass.
 Nothing done for IARs or HG transfers yet -- this only works for OARs for the
 time being. New migration in inventory table in order to make CreatorID
 varchar(255).

---
 OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs          | 3 +++
 .../Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | 2 ++
 OpenSim/Services/InventoryService/XInventoryService.cs                | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
index 403ee15..88fbda3 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
@@ -312,6 +312,7 @@ namespace OpenSim.Services.Connectors
                         { "InvType", item.InvType.ToString() },
                         { "Folder", item.Folder.ToString() },
                         { "CreatorId", item.CreatorId.ToString() },
+                        { "CreatorData", item.CreatorData.ToString() },
                         { "Description", item.Description.ToString() },
                         { "NextPermissions", item.NextPermissions.ToString() },
                         { "CurrentPermissions", item.CurrentPermissions.ToString() },
@@ -344,6 +345,7 @@ namespace OpenSim.Services.Connectors
                         { "InvType", item.InvType.ToString() },
                         { "Folder", item.Folder.ToString() },
                         { "CreatorId", item.CreatorId.ToString() },
+                        { "CreatorData", item.CreatorData.ToString() },
                         { "Description", item.Description.ToString() },
                         { "NextPermissions", item.NextPermissions.ToString() },
                         { "CurrentPermissions", item.CurrentPermissions.ToString() },
@@ -556,6 +558,7 @@ namespace OpenSim.Services.Connectors
                 item.InvType = int.Parse(data["InvType"].ToString());
                 item.Folder = new UUID(data["Folder"].ToString());
                 item.CreatorId = data["CreatorId"].ToString();
+                item.CreatorData = data["CreatorData"].ToString();
                 item.Description = data["Description"].ToString();
                 item.NextPermissions = uint.Parse(data["NextPermissions"].ToString());
                 item.CurrentPermissions = uint.Parse(data["CurrentPermissions"].ToString());
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 21ad4ab..61f3fbe 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -612,6 +612,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "Name", item.Name },
                 { "Description", item.Description },
                 { "CreatorID", item.CreatorId },
+                { "CreatorData", item.CreatorData },
                 { "ContentType", invContentType },
                 { "ExtraData", OSDParser.SerializeJsonString(extraData) }
             };
@@ -776,6 +777,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     invItem.AssetType = SLUtil.ContentTypeToSLAssetType(item["ContentType"].AsString());
                     invItem.CreationDate = item["CreationDate"].AsInteger();
                     invItem.CreatorId = item["CreatorID"].AsString();
+                    invItem.CreatorData = item["CreatorData"].AsString();
                     invItem.CreatorIdAsUuid = item["CreatorID"].AsUUID();
                     invItem.Description = item["Description"].AsString();
                     invItem.Folder = item["ParentID"].AsUUID();
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index fb395ec..e602412 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -524,7 +524,7 @@ namespace OpenSim.Services.InventoryService
             newItem.ID = item.inventoryID;
             newItem.InvType = item.invType;
             newItem.Folder = item.parentFolderID;
-            newItem.CreatorId = item.creatorID;
+            newItem.CreatorIdentification = item.creatorID;
             newItem.Description = item.inventoryDescription;
             newItem.NextPermissions = (uint)item.inventoryNextPermissions;
             newItem.CurrentPermissions = (uint)item.inventoryCurrentPermissions;
@@ -555,7 +555,7 @@ namespace OpenSim.Services.InventoryService
             newItem.inventoryID = item.ID;
             newItem.invType = item.InvType;
             newItem.parentFolderID = item.Folder;
-            newItem.creatorID = item.CreatorId;
+            newItem.creatorID = item.CreatorIdentification;
             newItem.inventoryDescription = item.Description;
             newItem.inventoryNextPermissions = (int)item.NextPermissions;
             newItem.inventoryCurrentPermissions = (int)item.CurrentPermissions;
-- 
cgit v1.1