via: abd1a5786ac8079d735ede53515dbaedd8324acd (commit)
from: d850c3f8a176e25142ee03cf316f4f19204837ea (commit)
= COMMIT LOG ===========================================================
committer: Mitch Capper
comments:
Minor cleanup, removed options that were not needed, and stop debug logging.
diff --git a/mitchcapper/FSClient/Broker.cs b/mitchcapper/FSClient/Broker.cs
index b97d932..959dc0d 100644
--- a/mitchcapper/FSClient/Broker.cs
+++ b/mitchcapper/FSClient/Broker.cs
@@ -652,7 +652,7 @@ namespace FSClient {
XmlUtils.AddNodeAttrib(config_node, "name", name);
XmlUtils.AddNodeAttrib(config_node, "description", desc);
func(config_node);
- root_doc.Save(@"c:\temp\fs_" + name);
+ //root_doc.Save(@"c:\temp\fs_" + name);
return root_doc.OuterXml;
}
private string xml_search(FreeSWITCH.SwitchXmlSearchBinding.XmlBindingArgs args) {
@@ -674,9 +674,9 @@ namespace FSClient {
private static IDisposable event_bind;
private void fs_core_init() {
- fs_inited = true;
- freeswitch.switch_core_set_globals();
+ fs_inited = true;
String err = "";
+ freeswitch.switch_core_set_globals();
const uint flags = (uint)(switch_core_flag_enum_t.SCF_USE_SQL | switch_core_flag_enum_t.SCF_USE_AUTO_NAT);
switch_status_t res = freeswitch.switch_core_init(flags, switch_bool_t.SWITCH_FALSE, ref err);
search_bind = FreeSWITCH.SwitchXmlSearchBinding.Bind(xml_search, switch_xml_section_enum_t.SWITCH_XML_SECTION_CONFIG);
diff --git a/mitchcapper/FSClient/External Items/conf/freeswitch.xml b/mitchcapper/FSClient/External Items/conf/freeswitch.xml
index abd04ad..8c53be0 100644
--- a/mitchcapper/FSClient/External Items/conf/freeswitch.xml
+++ b/mitchcapper/FSClient/External Items/conf/freeswitch.xml
@@ -1,14 +1,8 @@
<?xml version="1.0"?>
<document type="freeswitch/xml">
- <X-PRE-PROCESS cmd="set" data="auto_answer=false"/>
- <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/>
<X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
- <X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.freeswitch.org"/>
- <X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.freeswitch.org"/>
<X-PRE-PROCESS cmd="set" data="console_loglevel=info"/>
<X-PRE-PROCESS cmd="set" data="us-ring=v=0;%(2000,4000,440.0,480.0)"/>
- <X-PRE-PROCESS cmd="set" data="bong-ring=v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/>
- <X-PRE-PROCESS cmd="set" data="sit=%(274,0,913.8);%(274,0,1370.6);%(380,0,1776.7)"/>
<section name="configuration" description="Various Configuration">
<configuration name="console.conf" description="Console Logger">
@@ -36,15 +30,12 @@
</settings>
<profiles>
<profile name="default">
- <settings>
- </settings>
<mappings>
<map name="all" value="debug,info,notice,warning,err,crit,alert"/>
</mappings>
</profile>
</profiles>
</configuration>
-
<configuration name="modules.conf" description="Modules">
<modules>
<load module="mod_console"/>
@@ -69,38 +60,20 @@
<load module="mod_event_socket"/>
</modules>
</configuration>
-
<configuration name="portaudio.conf" description="Soundcard Endpoint">
<settings>
- <param name="indev" value="4"/>
- <param name="outdev" value="8"/>
- <param name="ringdev" value="8"/>
<param name="dual-streams" value="true" />
<param name="live-stream-switch" value="true" />
<param name="no-auto-resume-call" value="true" />
- <param name="no-ring-during-call" value="true" />
-
-
+ <param name="no-ring-during-call" value="true" />
<param name="ring-file" value="tone_stream://%(2000,4000,440.0,480.0);loops=20"/>
<param name="ring-interval" value="5"/>
<param name="hold-file" value="$${hold_music}"/>
<param name="dialplan" value="XML"/>
<param name="sample-rate" value="24000"/>
<param name="codec-ms" value="20"/>
- <!--
- Alternate items:
- codec-ms
- sample-rate=8000
-
- -->
</settings>
</configuration>
-
- <configuration name="post_load_modules.conf" description="Modules">
- <modules>
- </modules>
- </configuration>
-
<configuration name="switch.conf" description="Core Configuration">
<cli-keybindings>
<key name="1" value="help"/>
@@ -117,12 +90,10 @@
<key name="12" value="version"/>
</cli-keybindings>
<settings>
- <param name="colorize-console" value="true"/>
- <param name="max-sessions" value="20"/>
- <param name="sessions-per-second" value="5"/>
+ <param name="colorize" value="true"/>
+ <param name="max-sessions" value="100"/>
+ <param name="sessions-per-second" value="30"/>
<param name="loglevel" value="debug"/>
- <param name="crash-protection" value="false"/>
- <param name="dump-cores" value="yes"/>
<param name="rtp-start-port" value="16384"/>
<param name="rtp-end-port" value="16484"/>
</settings>
diff --git a/mitchcapper/FSClient/Sofia.cs b/mitchcapper/FSClient/Sofia.cs
index 3f776d6..b3f3b3d 100644
--- a/mitchcapper/FSClient/Sofia.cs
+++ b/mitchcapper/FSClient/Sofia.cs
@@ -75,7 +75,6 @@ namespace FSClient {
XmlNode global_settings = XmlUtils.AddNodeNode(config_node, "global_settings");
Utils.add_xml_param(global_settings, "auto-restart", "true");
- Utils.add_xml_param(global_settings, "debug-presence", "0");
Utils.add_xml_param(global_settings, "log-level", "0");
XmlNode profiles = XmlUtils.AddNodeNode(config_node, "profiles");
XmlNode profile = XmlUtils.AddNodeNode(profiles, "profile");
@@ -87,7 +86,6 @@ namespace FSClient {
Utils.add_xml_param(settings, "context", "public");
Utils.add_xml_param(settings, "dialplan", "xml");
Utils.add_xml_param(settings, "disable-register", "true");
- Utils.add_xml_param(settings, "manage-presence", "false");
foreach (FieldValue value in values) {
if (!String.IsNullOrEmpty(value.field.xml_name))
Utils.add_xml_param(settings, value.field.xml_name, value.value);
Summary of changes: mitchcapper/FSClient/Broker.cs | 6 ++-- .../FSClient/External Items/conf/freeswitch.xml | 37 ++----------------- mitchcapper/FSClient/Sofia.cs | 2 - 3 files changed, 7 insertions(+), 38 deletions(-)
this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email
For more info, see http://blog.chomperstomp.com/?p=630
--
FreeSWITCH user-contributed scripts, etc