- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13047 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: anthm Date: Wed Apr 15 17:01:27 2009 New Revision: 13047 Log: fix fifo issues Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Wed Apr 15 17:01:27 2009 @@ -38,7 +38,7 @@ SWITCH_MODULE_DEFINITION(mod_fifo, mod_fifo_load, mod_fifo_shutdown, NULL); #define FIFO_EVENT "fifo::info" - +#define FIFO_DELAY_DESTROY 100 static switch_status_t load_config(int reload, int del_all); #define MAX_PRI 10 @@ -369,13 +369,16 @@ { fifo_node_t *node; int x = 0; + switch_memory_pool_t *pool; if (!globals.running) { return NULL; } - node = switch_core_alloc(globals.pool, sizeof(*node)); - node->pool = globals.pool; + switch_core_new_memory_pool(&pool); + + node = switch_core_alloc(pool, sizeof(*node)); + node->pool = pool; node->name = switch_core_strdup(node->pool, name); for (x = 0; x < MAX_PRI; x++) { @@ -387,7 +390,9 @@ switch_thread_rwlock_create(&node->rwlock, node->pool); switch_mutex_init(&node->mutex, SWITCH_MUTEX_NESTED, node->pool); node->importance = importance; + switch_mutex_lock(globals.mutex); switch_core_hash_insert(globals.fifo_hash, name, node); + switch_mutex_unlock(globals.mutex); return node; } @@ -526,7 +531,7 @@ sql = switch_mprintf("select uuid, fifo_name, originate_string, simo_count, use_count, timeout, lag, " "next_avail, expires, static, outbound_call_count, outbound_fail_count, hostname " - "from fifo_outbound where (fifo_name = '%s') and (use_count < simo_count) and (next_avail = 0 or next_avail <= %ld) " + "from fifo_outbound where (fifo_name = '%q') and (use_count < simo_count) and (next_avail = 0 or next_avail <= %ld) " "order by outbound_call_count", node->name, (long) switch_epoch_time_now(NULL)); switch_assert(sql); @@ -747,6 +752,7 @@ } } + if (!(node = switch_core_hash_find(globals.fifo_hash, nlist[i]))) { node = create_node(nlist[i], importance); } @@ -963,12 +969,15 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FIFO-Action", cd.do_orbit ? "timeout" : "abort"); switch_event_fire(&event); } + + switch_mutex_lock(globals.mutex); switch_mutex_lock(node->mutex); node_remove_uuid(node, uuid); node->caller_count--; switch_core_hash_delete(node->caller_hash, uuid); switch_mutex_unlock(node->mutex); send_presence(node); + switch_mutex_unlock(globals.mutex); } @@ -1406,6 +1415,19 @@ } done: + + switch_mutex_lock(globals.mutex); + if (node && node->ready == FIFO_DELAY_DESTROY && node->consumer_count == 0 && node->caller_count == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s removed. (delayed)\n", node->name); + switch_core_hash_delete(globals.fifo_hash, node->name); + switch_core_hash_destroy(&node->caller_hash); + switch_core_hash_destroy(&node->consumer_hash); + switch_thread_rwlock_unlock(node->rwlock); + switch_core_destroy_memory_pool(&node->pool); + } + switch_mutex_unlock(globals.mutex); + + switch_channel_clear_app_flag(channel, CF_APP_TAGGED); switch_core_media_bug_resume(session); @@ -1460,7 +1482,9 @@ static int xml_outbound(switch_xml_t xml, fifo_node_t *node, char *container, char *tag, int cc_off, int verbose) { struct xml_helper h; - char *sql = "select uuid, fifo_name, originate_string, simo_count, use_count, timeout, lag, next_avail, expires, static, outbound_call_count, outbound_fail_count, hostname from fifo_outbound"; + char *sql = switch_mprintf("select uuid, fifo_name, originate_string, simo_count, use_count, timeout, " + "lag, next_avail, expires, static, outbound_call_count, outbound_fail_count, " + "hostname from fifo_outbound where fifo_name = '%q'", node->name); h.xml = xml; h.node = node; @@ -1471,6 +1495,8 @@ fifo_execute_sql_callback(globals.sql_mutex, sql, xml_callback, &h); + switch_safe_free(sql); + return h.cc_off; } @@ -1763,12 +1789,14 @@ switch_hash_index_t *hi; fifo_node_t *node; void *val; + switch_mutex_lock(globals.mutex); for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); if ((node = (fifo_node_t *) val) && node->is_static) { node->ready = 0; } } + switch_mutex_unlock(globals.mutex); } if (del_all) { @@ -1869,6 +1897,8 @@ switch_hash_index_t *hi; void *val, *pop; fifo_node_t *node; + switch_mutex_lock(globals.mutex); + top: for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { int x = 0; switch_hash_this(hi, NULL, NULL, &val); @@ -1877,8 +1907,8 @@ } if (node_consumer_wait_count(node) || node->consumer_count || node_idle_consumers(node)) { - node->ready = 1; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s not removed, still in use.\n", node->name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s removal delayed, still in use.\n", node->name); + node->ready = FIFO_DELAY_DESTROY; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s removed.\n", node->name); switch_thread_rwlock_wrlock(node->rwlock); @@ -1887,12 +1917,16 @@ free(pop); } } - + + switch_core_hash_delete(globals.fifo_hash, node->name); switch_core_hash_destroy(&node->caller_hash); switch_core_hash_destroy(&node->consumer_hash); switch_thread_rwlock_unlock(node->rwlock); + switch_core_destroy_memory_pool(&node->pool); + goto top; } } + switch_mutex_unlock(globals.mutex); } @@ -1924,7 +1958,8 @@ node->has_outbound = 1; sql = switch_mprintf("insert into fifo_outbound " - "(uuid, fifo_name, originate_string, simo_count, use_count, timeout, lag, next_avail, expires, static, outbound_call_count, outbound_fail_count, hostname) " + "(uuid, fifo_name, originate_string, simo_count, use_count, timeout, " + "lag, next_avail, expires, static, outbound_call_count, outbound_fail_count, hostname) " "values ('%q','%q','%q',%d,%d,%d,%d,%d,%ld,0,0,0,'%q')", digest, fifo_name, originate_string, simo_count, 0, timeout, lag, 0, (long)expires, globals.hostname ); @@ -2088,7 +2123,7 @@ stop_node_thread(); } - + top: for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { int x = 0; switch_hash_this(hi, NULL, NULL, &val); @@ -2101,9 +2136,12 @@ } } + switch_core_hash_delete(globals.fifo_hash, node->name); switch_core_hash_destroy(&node->caller_hash); switch_core_hash_destroy(&node->consumer_hash); switch_thread_rwlock_unlock(node->rwlock); + switch_core_destroy_memory_pool(&node->pool); + goto top; } switch_core_hash_destroy(&globals.fifo_hash); memset(&globals, 0, sizeof(globals));

1 0

[commit] r13046 - in freeswitch/trunk/conf: autoload_configs dialplan
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: mcollins Date: Wed Apr 15 15:33:49 2009 New Revision: 13046 Log: Add ext 9991 as ClueCon ext; use transfer instead of bridge on demo ivr opt #4 Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Wed Apr 15 15:33:49 2009 @@ -15,9 +15,9 @@ <entry action="menu-exec-app" digits="1" param="bridge sofia/$${domain}/888(a)conference.freeswitch.org"/> <entry action="menu-exec-app" digits="2" param="transfer 9996 XML default"/>  <entry action="menu-exec-app" digits="3" param="transfer 9999 XML default"/>  - <entry action="menu-exec-app" digits="4" param="bridge sofia/$${domain}/brian(a)bkw.org"/>  - <entry action="menu-exec-app" digits="5" param="transfer 1234*256 enum"/>  - <entry action="menu-sub" digits="6" param="demo_ivr_submenu"/>  + <entry action="menu-exec-app" digits="4" param="transfer 9991 XML default"/>  + <entry action="menu-exec-app" digits="5" param="transfer 1234*256 enum"/>  + <entry action="menu-sub" digits="6" param="demo_ivr_submenu"/>  <entry action="menu-exec-app" digits="/^(10[01][0-9])$/" param="transfer $1 XML features"/> <entry action="menu-top" digits="9"/>  </menu> Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Apr 15 15:33:49 2009 @@ -540,6 +540,13 @@ </condition> </extension> + <extension name="ClueCon"> + <condition field="destination_number" expression="^9991$"> + <action application="set" data="effective_caller_id_name=ClueCon"/> + <action application="bridge" data="sofia/$${domain}/brian(a)bkw.org"/> + </condition> + </extension> + <extension name="show_info"> <condition field="destination_number" expression="^9992$"> <action application="answer"/>

1 0

[commit] r13045 - freeswitch/trunk/conf/lang/ru/demo
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: buklov Date: Wed Apr 15 15:13:53 2009 New Revision: 13045 Log: Update phrase_ru.xml to include v1.0.8 sound prompts Modified: freeswitch/trunk/conf/lang/ru/demo/demo-ivr.xml Modified: freeswitch/trunk/conf/lang/ru/demo/demo-ivr.xml ============================================================================== --- freeswitch/trunk/conf/lang/ru/demo/demo-ivr.xml (original) +++ freeswitch/trunk/conf/lang/ru/demo/demo-ivr.xml Wed Apr 15 15:13:53 2009 @@ -1,68 +1,61 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="Windows-1252"?> <include> <macro name="demo_ivr_count"> <input pattern="^(\d+)$"> <match> - <action function="play-file" data="voicemail/vm-you_have.wav"/> - <action function="say" data="$1" method="pronounced" type="name_spelled"/> - <action function="play-file" data="voicemail/vm-messages.wav"/> + <action function="play-file" data="voicemail/vm-you_have.wav"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-messages.wav"/> </match> </input> </macro> - <macro name="demo_ivr_main_menu">  + <macro name="demo_ivr_main_menu" pause="250">  <input pattern="(.*)"> <match>  <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>  - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/> <action function="execute" data="sleep(1500)"/> <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/1.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/2.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/3.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/4.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/> - <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/5.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/9.wav"/> @@ -73,48 +66,42 @@   - <macro name="demo_ivr_main_menu_short"> + <macro name="demo_ivr_main_menu_short" pause="250"> <input pattern="(.*)"> <match>  <action function="execute" data="sleep(1000)"/> <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/1.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/2.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/3.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/4.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/5.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/9.wav"/> @@ -128,16 +115,14 @@ <input pattern="(.*)"> <match> <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-sample_submenu.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/star.wav"/> - <action function="execute" data="sleep(250)"/> + </match> </input> </macro> @@ -149,11 +134,10 @@ <match>  <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/star.wav"/> - <action function="execute" data="sleep(250)"/> + </match> </input> </macro>

1 0

[commit] r13044 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: buklov Date: Wed Apr 15 15:10:40 2009 New Revision: 13044 Log: Update phrase_ru.xml to include v1.0.8 sound prompts Modified: freeswitch/trunk/docs/phrase/phrase_ru.xml Modified: freeswitch/trunk/docs/phrase/phrase_ru.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_ru.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_ru.xml Wed Apr 15 15:10:40 2009 @@ -427,6 +427,7 @@ <prompt phrase="для того что бы послать собощение " filename= "vm-send_message_now.wav"/> <prompt phrase="пожалуйста, введите добавочный номер для отправки сообщения" filename= "vm-forward_enter_ext.wav"/> <prompt phrase="Неправильный добавочный номер" filename= "vm-that_was_an_invalid_ext.wav"/> + <prompt phrase="Почтовый ящик переполнен. Пожалуйста перезвоните позже" filename= "vm-mailbox_full.wav"/> </voicemail> <conference> <prompt phrase="NULL " filename= "conf-ack type.wav"/> @@ -491,6 +492,21 @@ <prompt phrase="Центр обслуживания клиентов " filename= "ivr-customer_service.wav"/> <prompt phrase="Отдел технической поддержки " filename= "ivr-technical_support.wav"/> <prompt phrase="Оператор " filename= "ivr-operator.wav"/> + <prompt phrase="Вы набрали несуществующий добавочный номер" filename= "ivr-you_have_dialed_an_invalid_extension.wav"/> + <prompt phrase="Пожалйста, наберите добавочный номер и нажмите клавишу решетка" filename= "ivr-please_enter_extension_followed_by_pound.wav"/> + <prompt phrase="Пожалуйста введите ваш пинкод и нажмите клавишу решётка" filename= "ivr-please_enter_pin_followed_by_pound.wav"/> + <prompt phrase="Ваш пин код или номер не верны" filename= "ivr-pin_or_extension_is-invalid.wav"/> + <prompt phrase="вы почти закрепили этот телефон за вашей учётной записью" filename= "ivr-you_are_about_to_provision_this_phone.wav"/> + <prompt phrase="пожалуйста повторите ваш пин код для подтверждения" filename= "ivr-please_reenter_your_pin.wav"/> + <prompt phrase="Для регистрации на clueCon , пожалуйста нажмите .." filename= "ivr-register_for_cluecon.wav"/> + <prompt phrase="Для входа" filename= "ivr-to_log_in.wav"/> + <prompt phrase="Для выхода" filename= "ivr-to_log_out.wav"/> + <prompt phrase="Вы вошли" filename= "ivr-you_are_now_logged_in.wav"/> + <prompt phrase="Вы вышли" filename= "ivr-you_are_now_logged_out.wav"/> + <prompt phrase="Попробуйте снова" filename= "ivr-please_try_again.wav"/> + <prompt phrase="Вы почти закрепили этот телефон за Вашим добавочным номером" filename= "ivr-provision_phone_permanently_to_extension.wav"/> + <prompt phrase="Пожалуйста введите добавочный номер за которым вы хотите закрепить этот телефон и нажмите решётку" filename= "ivr-extension_to_provision_this_phone.wav"/> + <prompt phrase="Спасибо, этот телефон сейчас перезагрузится" filename= "ivr-this_phone_will_now_reboot.wav"/> </ivr> <misc> <prompt phrase="Этот звонок шифруется " filename= "call_secured.wav"/>

1 0

[commit] r13043 - in freeswitch/trunk/conf: autoload_configs lang/en/demo
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: mcollins Date: Wed Apr 15 14:58:45 2009 New Revision: 13043 Log: Update sample IVR to include ClueCon reg option :) Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Wed Apr 15 14:58:45 2009 @@ -15,8 +15,9 @@ <entry action="menu-exec-app" digits="1" param="bridge sofia/$${domain}/888(a)conference.freeswitch.org"/> <entry action="menu-exec-app" digits="2" param="transfer 9996 XML default"/>  <entry action="menu-exec-app" digits="3" param="transfer 9999 XML default"/>  - <entry action="menu-sub" digits="4" param="demo_ivr_submenu"/>  + <entry action="menu-exec-app" digits="4" param="bridge sofia/$${domain}/brian(a)bkw.org"/>  <entry action="menu-exec-app" digits="5" param="transfer 1234*256 enum"/>  + <entry action="menu-sub" digits="6" param="demo_ivr_submenu"/>  <entry action="menu-exec-app" digits="/^(10[01][0-9])$/" param="transfer $1 XML features"/> <entry action="menu-top" digits="9"/>  </menu> Modified: freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml (original) +++ freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Wed Apr 15 14:58:45 2009 @@ -41,19 +41,22 @@ <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/3.wav"/> -  - <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/> - <action function="play-file" data="ivr/ivr-please.wav"/> - <action function="play-file" data="voicemail/vm-press.wav"/> +  + <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/> <action function="play-file" data="digits/4.wav"/>  <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/> - <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/5.wav"/> +  + <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/6.wav"/> +  <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/> <action function="play-file" data="ivr/ivr-please.wav"/>

1 0

[commit] r13042 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: brian Date: Wed Apr 15 14:36:33 2009 New Revision: 13042 Log: setting the moh_sound from a variable Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Apr 15 14:36:33 2009 @@ -4746,6 +4746,11 @@ switch_channel_set_variable(channel, "conference_name", conference->name); + /* Set MOH from variable if not set */ + if(switch_strlen_zero(conference->moh_sound)) { + conference->moh_sound = switch_core_strdup(conference->pool, switch_channel_get_variable(channel, "conference_moh_sound")); + } + /* Set the minimum number of members (once you go above it you cannot go below it) */ conference->min = 1;

1 0

[commit] r13041 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: mcollins Date: Wed Apr 15 13:48:33 2009 New Revision: 13041 Log: Update phrase_en.xml to include v1.0.8 sound prompts Modified: freeswitch/trunk/docs/phrase/phrase_en.xml Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Wed Apr 15 13:48:33 2009 @@ -217,6 +217,7 @@ <prompt phrase="in folder inbox" filename="vm-in_folder.wav"/> <prompt phrase="to return the call now" filename="vm-return_call.wav"/> <prompt phrase="urgent" filename="vm-urgent.wav"/> + <prompt phrase="That mailbox is full. Please try your call again later." filename="vm-mailbox_full.wav"/> </voicemail> <conference> <prompt phrase="NULL" filename="conf-ack.wav" type="tone"/> @@ -281,6 +282,21 @@ <prompt phrase="Customer service" filename="ivr-customer_service.wav"/> <prompt phrase="Technical support" filename="ivr-technical_support.wav"/> <prompt phrase="Operator" filename="ivr-operator.wav"/> + <prompt phrase="You have dialed an invalid extension." filename="ivr-you_have_dialed_an_invalid_extension.wav"/> + <prompt phrase="Please enter your extension, followed by the pound sign." filename="ivr-please_enter_extension_followed_by_pound.wav"/> + <prompt phrase="Please enter your pin number, followed by the pound sign." filename="ivr-please_enter_pin_followed_by_pound.wav"/> + <prompt phrase="Your pin number or extension is invalid." filename="ivr-pin_or_extension_is-invalid.wav"/> + <prompt phrase="You are about to provision this phone to your account..." filename="ivr-you_are_about_to_provision_this_phone.wav"/> + <prompt phrase="Please re-enter your pin number to confirm." filename="ivr-please_reenter_your_pin.wav"/> + <prompt phrase="To register for ClueCon, please press..." filename="ivr-register_for_cluecon.wav"/> + <prompt phrase="to log in" filename="ivr-to_log_in.wav"/> + <prompt phrase="to log out" filename="ivr-to_log_out.wav"/> + <prompt phrase="You are now logged in" filename="ivr-you_are_now_logged_in.wav"/> + <prompt phrase="You are now logged out" filename="ivr-you_are_now_logged_out.wav"/> + <prompt phrase="Please try again." filename="ivr-please_try_again.wav"/> + <prompt phrase="You are about to provision this phone permanently to your extension." filename="ivr-provision_phone_permanently_to_extension.wav"/> + <prompt phrase="Please enter the extension number to which you would like to provision this phone, followed by the pound sign." filename="ivr-extension_to_provision_this_phone.wav"/> + <prompt phrase="Thank you, this phone will now reboot." filename="ivr-this_phone_will_now_reboot.wav"/> </ivr> <misc> <prompt phrase="This call has been secured" filename="call_secured.wav"/> @@ -292,6 +308,8 @@ <prompt phrase="Transfer" filename="transfer2.wav"/> <prompt phrase="We are trying to reach" filename="we_are_trying_to_reach.wav"/> <prompt phrase="An error has occurred please contact the administrator" filename="error.wav"/> + <prompt phrase="Your call will be terminated in..." filename="misc-your_call_will_be_terminated_in.wav"/> + <prompt phrase="Your call has been terminated." filename="misc-your_call_has_been_terminated.wav"/> </misc> </en> </language>

1 0

[commit] r13040 - freeswitch/trunk/build
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: brian Date: Wed Apr 15 13:42:08 2009 New Revision: 13040 Log: bump sounds version Modified: freeswitch/trunk/build/sounds_version.txt Modified: freeswitch/trunk/build/sounds_version.txt ============================================================================== --- freeswitch/trunk/build/sounds_version.txt (original) +++ freeswitch/trunk/build/sounds_version.txt Wed Apr 15 13:42:08 2009 @@ -1 +1 @@ -1.0.7 +1.0.8

1 0

[commit] r13038 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: brian Date: Wed Apr 15 12:55:30 2009 New Revision: 13038 Log: MODAPP-189 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Wed Apr 15 12:55:30 2009 @@ -184,6 +184,8 @@ time_t orbit_timeout; int do_orbit; char *orbit_exten; + char *orbit_dialplan; + char *orbit_context; }; typedef struct fifo_chime_data fifo_chime_data_t; @@ -794,16 +796,19 @@ fifo_chime_data_t cd = { {0} }; const char *chime_list = switch_channel_get_variable(channel, "fifo_chime_list"); const char *chime_freq = switch_channel_get_variable(channel, "fifo_chime_freq"); - const char *orbit_var = switch_channel_get_variable(channel, "fifo_orbit_exten"); + const char *orbit_exten = switch_channel_get_variable(channel, "fifo_orbit_exten"); + const char *orbit_dialplan = switch_channel_get_variable(channel, "fifo_orbit_dialplan"); + const char *orbit_context = switch_channel_get_variable(channel, "fifo_orbit_context"); + const char *orbit_ann = switch_channel_get_variable(channel, "fifo_orbit_announce"); const char *caller_exit_key = switch_channel_get_variable(channel, "fifo_caller_exit_key"); int freq = 30; int ftmp = 0; int to = 60; - if (orbit_var) { + if (orbit_exten) { char *ot; - if ((cd.orbit_exten = switch_core_session_strdup(session, orbit_var))) { + if ((cd.orbit_exten = switch_core_session_strdup(session, orbit_exten))) { if ((ot = strchr(cd.orbit_exten, ':'))) { *ot++ = '\0'; if ((to = atoi(ot)) < 0) { @@ -812,6 +817,8 @@ } cd.orbit_timeout = switch_epoch_time_now(NULL) + to; } + cd.orbit_dialplan = switch_core_session_strdup(session, orbit_dialplan); + cd.orbit_context = switch_core_session_strdup(session, orbit_context); } if (chime_freq) { @@ -969,7 +976,7 @@ if (orbit_ann) { switch_ivr_play_file(session, NULL, orbit_ann, NULL); } - switch_ivr_session_transfer(session, cd.orbit_exten, NULL, NULL); + switch_ivr_session_transfer(session, cd.orbit_exten, cd.orbit_dialplan, cd.orbit_context); } goto done;

1 0

[commit] r13037 - freeswitch/trunk/build
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: brian Date: Wed Apr 15 12:05:36 2009 New Revision: 13037 Log: add mod_say_ru to modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Wed Apr 15 12:05:36 2009 @@ -77,4 +77,5 @@ #say/mod_say_fr #say/mod_say_it #say/mod_say_nl +#say/mod_say_ru #say/mod_say_zh

1 0