November 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6285 - in freeswitch/trunk/src/mod: asr_tts/mod_openmrcp event_handlers/mod_cdr
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:44:02 2007 New Revision: 6285 Removed: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.conf.xml Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Log: more cleanup Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Thu Nov 15 13:44:02 2007 @@ -771,7 +771,7 @@ static switch_status_t do_config() { - char *cf = "mod_openmrcp.conf"; + char *cf = "openmrcp.conf"; switch_xml_t cfg, xml, settings, profiles, xprofile, param; openmrcp_profile_t *mrcp_profile; openmrcp_client_options_t *mrcp_options; Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Thu Nov 15 13:44:02 2007 @@ -48,7 +48,7 @@ queue_paused = 0; - strcpy(configfile,"mod_cdr.conf"); + strcpy(configfile,"cdr.conf"); switch_mod_cdr_newchannel_t *newchannel; // = new switch_mod_cdr_newchannel_t; newchannel = 0;

1 0

[commit] r6284 - freeswitch/trunk/conf
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:43:49 2007 New Revision: 6284 Added: freeswitch/trunk/conf/cdr.conf.xml - copied unchanged from r6281, /freeswitch/trunk/conf/mod_cdr.conf.xml freeswitch/trunk/conf/local_stream.conf.xml - copied unchanged from r6282, /freeswitch/trunk/conf/mod_local_stream.conf.xml freeswitch/trunk/conf/openmrcp.conf.xml - copied unchanged from r6281, /freeswitch/trunk/conf/mod_openmrcp.conf.xml Removed: freeswitch/trunk/conf/mod_cdr.conf.xml freeswitch/trunk/conf/mod_local_stream.conf.xml freeswitch/trunk/conf/mod_openmrcp.conf.xml Modified: freeswitch/trunk/conf/freeswitch.xml Log: cleanup Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Nov 15 13:43:49 2007 @@ -44,7 +44,7 @@   - <XX-PRE-PROCESS cmd="include" data="mod_cdr.conf.xml"/> + <XX-PRE-PROCESS cmd="include" data="cdr.conf.xml"/> <X-PRE-PROCESS cmd="include" data="event_multicast.conf.xml"/> <X-PRE-PROCESS cmd="include" data="event_socket.conf.xml"/> <X-PRE-PROCESS cmd="include" data="zeroconf.conf.xml"/> @@ -88,11 +88,11 @@   <X-PRE-PROCESS cmd="include" data="rss.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="mod_openmrcp.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="openmrcp.conf.xml"/>   - <X-PRE-PROCESS cmd="include" data="mod_local_stream.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="local_stream.conf.xml"/> </section> <section name="dialplan" description="Regex/XML Dialplan">

1 0

[commit] r6283 - in freeswitch/trunk/conf: . autoload_configs noload_configs
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:27:26 2007 New Revision: 6283 Added: freeswitch/trunk/conf/autoload_configs/ freeswitch/trunk/conf/noload_configs/ Modified: freeswitch/trunk/conf/freeswitch.xml Log: more fun Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Nov 15 13:27:26 2007 @@ -21,6 +21,9 @@ <X-PRE-PROCESS cmd="include" data="vars.xml"/> <section name="configuration" description="Various Configuration"> +  + <X-PRE-PROCESS cmd="include" data="autoload_configs/*.xml"/> + <X-PRE-PROCESS cmd="include" data="switch.conf.xml"/> <X-PRE-PROCESS cmd="include" data="modules.conf.xml"/>

1 0

[commit] r6282 - freeswitch/trunk/conf
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:23:03 2007 New Revision: 6282 Added: freeswitch/trunk/conf/mod_local_stream.conf.xml - copied unchanged from r6281, /freeswitch/trunk/conf/local_stream.conf.xml Removed: freeswitch/trunk/conf/local_stream.conf.xml Modified: freeswitch/trunk/conf/freeswitch.xml Log: fixes Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Nov 15 13:23:03 2007 @@ -44,7 +44,6 @@ <XX-PRE-PROCESS cmd="include" data="mod_cdr.conf.xml"/> <X-PRE-PROCESS cmd="include" data="event_multicast.conf.xml"/> <X-PRE-PROCESS cmd="include" data="event_socket.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="xmpp_event.conf.xml"/> <X-PRE-PROCESS cmd="include" data="zeroconf.conf.xml"/>

1 0

[commit] r6281 - in freeswitch/trunk/conf: . dialplan directory lang/de
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:21:22 2007 New Revision: 6281 Added: freeswitch/trunk/conf/lang/de/de.xml Removed: freeswitch/trunk/conf/lang_de.xml freeswitch/trunk/conf/lang_fr.xml freeswitch/trunk/conf/voicemail_de_tts.xml freeswitch/trunk/conf/voicemail_fr.xml Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/directory/default.xml Log: woops Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Nov 15 13:21:22 2007 @@ -1,9 +1,16 @@ <context name="default"> - <extension name="global"> + <extension name="global" continue="true"> <condition> <action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> </condition> +  + <condition field="${numbering_plan}" condition="^1$"> + <action application="set_user" data="default@${domain}"/> + </condition> </extension> +  - <extension name="FS_Conf_IAX"> +  + <extension name="FS_Conf_SIP"> <condition field="destination_number" expression="^888$"> - <action application="bridge" data="iax/guest(a)conference.freeswitch.org/888"/> + <action application="bridge" data="sofia/default/888(a)conference.freeswitch.org"/> </condition> </extension> Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Thu Nov 15 13:21:22 2007 @@ -1,6 +1,15 @@  <domain name="$${domain}">  + <user id="default">  + <variables> +  +  + <variable name="numbering_plan" value="US"/> +  + </variables> + </user> + <user id="brian" mailbox="1000">   <gateways> @@ -71,6 +80,7 @@  </vcard> </user> +  <user id="1000" mailbox="1000"> <params> Added: freeswitch/trunk/conf/lang/de/de.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/lang/de/de.xml Thu Nov 15 13:21:22 2007 @@ -0,0 +1,7 @@ +<include> + <language name="de" sound-path="/snds" tts-engine="cepstral" tts-voice="david"> + <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/> +  + <X-PRE-PROCESS cmd="include" data="vm/tts.xml"/> + </language> +</include>

1 0

[commit] r6280 - freeswitch/trunk/conf
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: intralanman Date: Thu Nov 15 13:08:59 2007 New Revision: 6280 Added: freeswitch/trunk/conf/local_stream.conf.xml (contents, props changed) Log: mod_local_stream example config Added: freeswitch/trunk/conf/local_stream.conf.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/local_stream.conf.xml Thu Nov 15 13:08:59 2007 @@ -0,0 +1,8 @@ +<configuration name="local_stream.conf" description="stream files from local dir"> +<directory name="foo" path="/var/lib/asterisk/moh"> + <param name="rate" value="8000"/> + <param name="channels" value="1"/> + <param name="interval" value="2"/> + <param name="timer_name" value="soft"/> +</directory> +</configuration>

1 0

[commit] r6279 - freeswitch/trunk/conf
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:07:23 2007 New Revision: 6279 Modified: freeswitch/trunk/conf/freeswitch.xml Log: tweak Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Nov 15 13:07:23 2007 @@ -41,7 +41,7 @@   - <X-PRE-PROCESS cmd="include" data="cdr.conf.xml"/> + <XX-PRE-PROCESS cmd="include" data="mod_cdr.conf.xml"/> <X-PRE-PROCESS cmd="include" data="event_multicast.conf.xml"/> <X-PRE-PROCESS cmd="include" data="event_socket.conf.xml"/> <X-PRE-PROCESS cmd="include" data="xmpp_event.conf.xml"/> @@ -90,7 +90,6 @@   - <X-PRE-PROCESS cmd="include" data="mod_cdr.conf.xml"/> <X-PRE-PROCESS cmd="include" data="mod_local_stream.conf.xml"/> </section>

1 0

[commit] r6278 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 12:44:29 2007 New Revision: 6278 Modified: freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/conf/sip_profiles/nat.xml Log: fix Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Thu Nov 15 12:44:29 2007 @@ -45,7 +45,7 @@ <settings> <param name="debug" value="1"/> <param name="rfc2833-pt" value="101"/> - <param name="sip-port" value="5062"/> + <param name="sip-port" value="5060"/> <param name="dialplan" value="XML,enum"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Thu Nov 15 12:44:29 2007 @@ -2,7 +2,7 @@ <settings> <param name="debug" value="1"/> <param name="rfc2833-pt" value="101"/> - <param name="sip-port" value="5061"/> + <param name="sip-port" value="5070"/> <param name="dialplan" value="XML,enum"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/>

1 0

[commit] r6277 - freeswitch/trunk/src
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: anthm Date: Thu Nov 15 12:24:53 2007 New Revision: 6277 Modified: freeswitch/trunk/src/switch_odbc.c Log: fix MODENDP-36 Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Thu Nov 15 12:24:53 2007 @@ -97,9 +97,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Disconnectiong [%s]\n", handle->dsn); } } - //else { - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "[%s] already disconnected\n", handle->dsn); - //} handle->state = SWITCH_ODBC_STATE_DOWN; @@ -163,17 +160,16 @@ } result = SQLGetInfo(handle->con, SQL_DRIVER_NAME, (SQLCHAR*)handle->odbc_driver, 255, &valueLength); - if ( result == SQL_SUCCESS || result == SQL_SUCCESS_WITH_INFO) - { + if ( result == SQL_SUCCESS || result == SQL_SUCCESS_WITH_INFO) { for (i = 0; i < valueLength; ++i) handle->odbc_driver[i] = (char)toupper(handle->odbc_driver[i]); } - //Firebird do not support "SELECT 1" - if (strstr(handle->odbc_driver, "FIREBIRD") != 0 || strstr(handle->odbc_driver, "FB32") != 0 || strstr(handle->odbc_driver, "FB64") != 0) + if (strstr(handle->odbc_driver, "FIREBIRD") != 0 || strstr(handle->odbc_driver, "FB32") != 0 || strstr(handle->odbc_driver, "FB64") != 0) { handle->is_firebird = TRUE; - else + } else { handle->is_firebird = FALSE; + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected to [%s]\n", handle->dsn); handle->state = SWITCH_ODBC_STATE_CONNECTED; @@ -190,20 +186,22 @@ switch_event_t *event; switch_odbc_status_t recon = 0; char *err_str = NULL; - SQLCHAR sql[255]; - - //Firebird do not support "SELECT 1" - sql[0] = 0; - if (handle->is_firebird) - strcpy((char*)sql, "select first 1 * from RDB$RELATIONS"); - else - strcpy((char*)sql, "select 1"); + SQLCHAR sql[255] = ""; + int max_tries = 120; + top: + if (!handle) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No DB Handle\n"); goto done; } + if (handle->is_firebird) { + strcpy((char*)sql, "select first 1 * from RDB$RELATIONS"); + } else { + strcpy((char*)sql, "select 1"); + } + if (SQLAllocHandle(SQL_HANDLE_STMT, handle->con, &stmt) != SQL_SUCCESS) { goto error; } @@ -217,17 +215,18 @@ SQLRowCount(stmt, &m); ret = (int) m; + if (result < 0 || m < 0) { + goto error; + } + goto done; error: err_str = switch_odbc_handle_get_error(handle, stmt); + recon = switch_odbc_handle_connect(handle); - // No need to reconnect if we can get the string anyway. - if (err_str == 0) - { - recon = switch_odbc_handle_connect(handle); - err_str = switch_odbc_handle_get_error(handle, stmt); - } + + max_tries--; if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Failure-Message", "The sql server is not responding for DSN %s [%s]", @@ -242,8 +241,21 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Additional-Info", "The connection could not be re-established"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "The connection could not be re-established\n"); } + if (!max_tries) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Additional-Info", "Giving up!"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Giving up!\n"); + } + switch_event_fire(&event); } + + if (!max_tries) { + goto done; + } + + switch_safe_free(err_str); + switch_yield(1000000); + goto top; done:

1 0

[commit] r6276 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: anthm Date: Thu Nov 15 12:04:22 2007 New Revision: 6276 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: tweak Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Thu Nov 15 12:04:22 2007 @@ -97,7 +97,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "open directory: %s\n", source->location); switch_yield(1000000); - while((fname = switch_dir_next_file(source->dir_handle, file_buf, sizeof(file_buf)))) { + while(RUNNING && (fname = switch_dir_next_file(source->dir_handle, file_buf, sizeof(file_buf)))) { switch_size_t olen; uint8_t *abuf[SWITCH_RECOMMENDED_BUFFER_SIZE] = {0};

1 0