aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2010-11-21 22:17:25 +0000
committerMelanie2010-11-21 22:17:25 +0000
commit2b0ef9ad1d46d89e01bc9149c8689aaa0b412587 (patch)
treec6710886fc78734106049f9b5224f27afadfc256 /OpenSim/Services
parentCorrect an error in Robust.ini.example (diff)
downloadopensim-SC-2b0ef9ad1d46d89e01bc9149c8689aaa0b412587.zip
opensim-SC-2b0ef9ad1d46d89e01bc9149c8689aaa0b412587.tar.gz
opensim-SC-2b0ef9ad1d46d89e01bc9149c8689aaa0b412587.tar.bz2
opensim-SC-2b0ef9ad1d46d89e01bc9149c8689aaa0b412587.tar.xz
Implement a method to allow regions to query the gridwide Freeswitch
configuration from ROBUST
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/FreeswitchService/FreeswitchService.cs20
-rw-r--r--OpenSim/Services/Interfaces/IFreeswitchService.cs1
2 files changed, 21 insertions, 0 deletions
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;
34using OpenSim.Data; 34using OpenSim.Data;
35using OpenSim.Services.Interfaces; 35using OpenSim.Services.Interfaces;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenMetaverse.StructuredData;
37using System.Collections; 38using System.Collections;
38 39
39namespace OpenSim.Services.FreeswitchService 40namespace OpenSim.Services.FreeswitchService
@@ -384,5 +385,24 @@ namespace OpenSim.Services.FreeswitchService
384 385
385 return response; 386 return response;
386 } 387 }
388
389 public string GetJsonConfig()
390 {
391 OSDMap map = new OSDMap(11);
392
393 map.Add("Realm", m_freeSwitchRealm);
394 map.Add("SIPProxy", m_freeSwitchSIPProxy);
395 map.Add("AttemptUseSTUN", m_freeSwitchAttemptUseSTUN);
396 map.Add("EchoServer", m_freeSwitchEchoServer);
397 map.Add("EchoPort", m_freeSwitchEchoPort);
398 map.Add("DefaultWellKnownIP", m_freeSwitchDefaultWellKnownIP);
399 map.Add("DefaultTimeout", m_freeSwitchDefaultTimeout);
400 map.Add("Context", m_freeSwitchContext);
401 map.Add("ServerUser", m_freeSwitchServerUser);
402 map.Add("ServerPass", m_freeSwitchServerPass);
403 map.Add("APIPrefix", m_freeSwitchAPIPrefix);
404
405 return OSDParser.SerializeJsonString(map);
406 }
387 } 407 }
388} 408}
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
35 { 35 {
36 Hashtable HandleDirectoryRequest(Hashtable requestBody); 36 Hashtable HandleDirectoryRequest(Hashtable requestBody);
37 Hashtable HandleDialplanRequest(Hashtable requestBody); 37 Hashtable HandleDialplanRequest(Hashtable requestBody);
38 string GetJsonConfig();
38 } 39 }
39} 40}