提交 a7d96a39 authored 作者: Mitch Capper's avatar Mitch Capper

Minor cleanup, removed options that were not needed, and stop debug logging.

上级 11ba2f64
...@@ -652,7 +652,7 @@ namespace FSClient { ...@@ -652,7 +652,7 @@ namespace FSClient {
XmlUtils.AddNodeAttrib(config_node, "name", name); XmlUtils.AddNodeAttrib(config_node, "name", name);
XmlUtils.AddNodeAttrib(config_node, "description", desc); XmlUtils.AddNodeAttrib(config_node, "description", desc);
func(config_node); func(config_node);
root_doc.Save(@"c:\temp\fs_" + name); //root_doc.Save(@"c:\temp\fs_" + name);
return root_doc.OuterXml; return root_doc.OuterXml;
} }
private string xml_search(FreeSWITCH.SwitchXmlSearchBinding.XmlBindingArgs args) { private string xml_search(FreeSWITCH.SwitchXmlSearchBinding.XmlBindingArgs args) {
...@@ -675,8 +675,8 @@ namespace FSClient { ...@@ -675,8 +675,8 @@ namespace FSClient {
private void fs_core_init() { private void fs_core_init() {
fs_inited = true; fs_inited = true;
freeswitch.switch_core_set_globals();
String err = ""; 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); 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); 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); search_bind = FreeSWITCH.SwitchXmlSearchBinding.Bind(xml_search, switch_xml_section_enum_t.SWITCH_XML_SECTION_CONFIG);
......
<?xml version="1.0"?> <?xml version="1.0"?>
<document type="freeswitch/xml"> <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="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="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="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"> <section name="configuration" description="Various Configuration">
<configuration name="console.conf" description="Console Logger"> <configuration name="console.conf" description="Console Logger">
...@@ -36,15 +30,12 @@ ...@@ -36,15 +30,12 @@
</settings> </settings>
<profiles> <profiles>
<profile name="default"> <profile name="default">
<settings>
</settings>
<mappings> <mappings>
<map name="all" value="debug,info,notice,warning,err,crit,alert"/> <map name="all" value="debug,info,notice,warning,err,crit,alert"/>
</mappings> </mappings>
</profile> </profile>
</profiles> </profiles>
</configuration> </configuration>
<configuration name="modules.conf" description="Modules"> <configuration name="modules.conf" description="Modules">
<modules> <modules>
<load module="mod_console"/> <load module="mod_console"/>
...@@ -69,38 +60,20 @@ ...@@ -69,38 +60,20 @@
<load module="mod_event_socket"/> <load module="mod_event_socket"/>
</modules> </modules>
</configuration> </configuration>
<configuration name="portaudio.conf" description="Soundcard Endpoint"> <configuration name="portaudio.conf" description="Soundcard Endpoint">
<settings> <settings>
<param name="indev" value="4"/>
<param name="outdev" value="8"/>
<param name="ringdev" value="8"/>
<param name="dual-streams" value="true" /> <param name="dual-streams" value="true" />
<param name="live-stream-switch" value="true" /> <param name="live-stream-switch" value="true" />
<param name="no-auto-resume-call" 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-file" value="tone_stream://%(2000,4000,440.0,480.0);loops=20"/>
<param name="ring-interval" value="5"/> <param name="ring-interval" value="5"/>
<param name="hold-file" value="$${hold_music}"/> <param name="hold-file" value="$${hold_music}"/>
<param name="dialplan" value="XML"/> <param name="dialplan" value="XML"/>
<param name="sample-rate" value="24000"/> <param name="sample-rate" value="24000"/>
<param name="codec-ms" value="20"/> <param name="codec-ms" value="20"/>
<!--
Alternate items:
codec-ms
sample-rate=8000
-->
</settings> </settings>
</configuration> </configuration>
<configuration name="post_load_modules.conf" description="Modules">
<modules>
</modules>
</configuration>
<configuration name="switch.conf" description="Core Configuration"> <configuration name="switch.conf" description="Core Configuration">
<cli-keybindings> <cli-keybindings>
<key name="1" value="help"/> <key name="1" value="help"/>
...@@ -117,12 +90,10 @@ ...@@ -117,12 +90,10 @@
<key name="12" value="version"/> <key name="12" value="version"/>
</cli-keybindings> </cli-keybindings>
<settings> <settings>
<param name="colorize-console" value="true"/> <param name="colorize" value="true"/>
<param name="max-sessions" value="20"/> <param name="max-sessions" value="100"/>
<param name="sessions-per-second" value="5"/> <param name="sessions-per-second" value="30"/>
<param name="loglevel" value="debug"/> <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-start-port" value="16384"/>
<param name="rtp-end-port" value="16484"/> <param name="rtp-end-port" value="16484"/>
</settings> </settings>
......
...@@ -75,7 +75,6 @@ namespace FSClient { ...@@ -75,7 +75,6 @@ namespace FSClient {
XmlNode global_settings = XmlUtils.AddNodeNode(config_node, "global_settings"); XmlNode global_settings = XmlUtils.AddNodeNode(config_node, "global_settings");
Utils.add_xml_param(global_settings, "auto-restart", "true"); 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"); Utils.add_xml_param(global_settings, "log-level", "0");
XmlNode profiles = XmlUtils.AddNodeNode(config_node, "profiles"); XmlNode profiles = XmlUtils.AddNodeNode(config_node, "profiles");
XmlNode profile = XmlUtils.AddNodeNode(profiles, "profile"); XmlNode profile = XmlUtils.AddNodeNode(profiles, "profile");
...@@ -87,7 +86,6 @@ namespace FSClient { ...@@ -87,7 +86,6 @@ namespace FSClient {
Utils.add_xml_param(settings, "context", "public"); Utils.add_xml_param(settings, "context", "public");
Utils.add_xml_param(settings, "dialplan", "xml"); Utils.add_xml_param(settings, "dialplan", "xml");
Utils.add_xml_param(settings, "disable-register", "true"); Utils.add_xml_param(settings, "disable-register", "true");
Utils.add_xml_param(settings, "manage-presence", "false");
foreach (FieldValue value in values) { foreach (FieldValue value in values) {
if (!String.IsNullOrEmpty(value.field.xml_name)) if (!String.IsNullOrEmpty(value.field.xml_name))
Utils.add_xml_param(settings, value.field.xml_name, value.value); Utils.add_xml_param(settings, value.field.xml_name, value.value);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑!
请 注册 或者 后发表评论