aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/FreeswitchService/FreeswitchService.cs
diff options
context:
space:
mode:
authorMelanie2010-11-21 23:47:28 +0000
committerMelanie2010-11-21 23:47:28 +0000
commit8d7b181b58d89b109b522d1b1401ea72cf16e694 (patch)
tree69d7ae271383933e82be070d652dc7979f54a09b /OpenSim/Services/FreeswitchService/FreeswitchService.cs
parentAdd the remote connector for freeswitch config retrieval (diff)
parentAdd the remote connector for freeswitch config retrieval (diff)
downloadopensim-SC_OLD-8d7b181b58d89b109b522d1b1401ea72cf16e694.zip
opensim-SC_OLD-8d7b181b58d89b109b522d1b1401ea72cf16e694.tar.gz
opensim-SC_OLD-8d7b181b58d89b109b522d1b1401ea72cf16e694.tar.bz2
opensim-SC_OLD-8d7b181b58d89b109b522d1b1401ea72cf16e694.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/FreeswitchService/FreeswitchService.cs')
-rw-r--r--OpenSim/Services/FreeswitchService/FreeswitchService.cs18
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
index b62a65a..fe6f5cd 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,22 @@ 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(9);
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("APIPrefix", m_freeSwitchAPIPrefix);
402
403 return OSDParser.SerializeJsonString(map);
404 }
387 } 405 }
388} 406}