October 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5874 - freeswitch/trunk/conf
by Freeswitch SVN 13 Oct '07

13 Oct '07

Author: brian Date: Sat Oct 13 16:41:18 2007 New Revision: 5874 Removed: freeswitch/trunk/conf/xmpp_event.conf.xml Log: remove this also since its deprecated

1 0

[commit] r5873 - freeswitch/trunk/conf
by Freeswitch SVN 13 Oct '07

13 Oct '07

Author: brian Date: Sat Oct 13 16:39:48 2007 New Revision: 5873 Modified: freeswitch/trunk/conf/default_context.xml Log: tweak Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Sat Oct 13 16:39:48 2007 @@ -115,7 +115,6 @@ </condition> </extension> - <extension name="testmusic"> <condition field="destination_number" expression="^1234$">

1 0

[commit] r5872 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 13 Oct '07

13 Oct '07

Author: anthm Date: Sat Oct 13 10:43:22 2007 New Revision: 5872 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: tweak Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Sat Oct 13 10:43:22 2007 @@ -482,6 +482,7 @@ vm_profile_t *profile; switch_file_handle_t *fh; char buf[4]; + int noexit; }; typedef struct call_control cc_t; @@ -497,13 +498,15 @@ switch_file_handle_t *fh = cc->fh; uint32_t pos = 0; - if (*dtmf == *cc->profile->delete_file_key || *dtmf == *cc->profile->save_file_key) { + if (!cc->noexit && (*dtmf == *cc->profile->delete_file_key || *dtmf == *cc->profile->save_file_key || *dtmf == *cc->profile->terminator_key)) { *cc->buf = *dtmf; return SWITCH_STATUS_BREAK; } + if (!fh) { return SWITCH_STATUS_SUCCESS; } + if (*dtmf == *cc->profile->pause_key) { if (switch_test_flag(fh, SWITCH_FILE_PAUSE)) { switch_clear_flag(fh, SWITCH_FILE_PAUSE); @@ -532,9 +535,6 @@ return SWITCH_STATUS_SUCCESS; } - if (*dtmf == *cc->profile->terminator_key) { - return SWITCH_STATUS_BREAK; - } } break; default: @@ -1181,6 +1181,7 @@ memset(&cc, 0, sizeof(cc)); cc.profile = profile; cc.fh = &fh; + cc.noexit = 1; args.buf = &cc; status = switch_ivr_play_file(session, NULL, file_path, &args); } @@ -1485,6 +1486,7 @@ memset(&cc, 0, sizeof(cc)); cc.profile = profile; cc.fh = &fh; + cc.noexit = 1; args.buf = &cc; if (!switch_strlen_zero(cbt.greeting_path)) {

1 0

[commit] r5871 - freeswitch/trunk/conf
by Freeswitch SVN 13 Oct '07

13 Oct '07

Author: brian Date: Fri Oct 12 23:35:19 2007 New Revision: 5871 Modified: freeswitch/trunk/conf/sofia.conf.xml Log: This should be on by default so MWI is on Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Fri Oct 12 23:35:19 2007 @@ -53,7 +53,7 @@ <param name="rtp-ip" value="$${bind_server_ip}"/> <param name="sip-ip" value="$${bind_server_ip}"/>  -  + <param name="manage-presence" value="true"/>  <param name="inbound-codec-negotiation" value="generous"/>

1 0

[commit] r5870 - in freeswitch/trunk: build src/mod/event_handlers/mod_xmpp_event
by Freeswitch SVN 13 Oct '07

13 Oct '07

Author: brian Date: Fri Oct 12 21:21:55 2007 New Revision: 5870 Removed: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/ Modified: freeswitch/trunk/build/modules.conf.in Log: remove mod_xmpp_event as its no longer needed Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Fri Oct 12 21:21:55 2007 @@ -11,11 +11,11 @@ #applications/mod_rss #asr_tts/mod_cepstral #asr_tts/mod_openmrcp -#codecs/mod_amr codecs/mod_g711 codecs/mod_g722 -#codecs/mod_g723_1 codecs/mod_g726 +#codecs/mod_g723_1 +#codecs/mod_amr #codecs/mod_g729 codecs/mod_gsm codecs/mod_ilbc @@ -38,7 +38,6 @@ event_handlers/mod_event_socket #event_handlers/mod_radius_cdr #event_handlers/mod_event_test -#event_handlers/mod_xmpp_event #event_handlers/mod_zeroconf formats/mod_native_file formats/mod_sndfile

1 0

[commit] r5869 - in freeswitch/trunk: build conf
by Freeswitch SVN 13 Oct '07

13 Oct '07

Author: brian Date: Fri Oct 12 21:14:45 2007 New Revision: 5869 Modified: freeswitch/trunk/build/modules.conf.in freeswitch/trunk/conf/modules.conf.xml Log: adding to default config Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Fri Oct 12 21:14:45 2007 @@ -13,9 +13,9 @@ #asr_tts/mod_openmrcp #codecs/mod_amr codecs/mod_g711 -#codecs/mod_g722 +codecs/mod_g722 #codecs/mod_g723_1 -#codecs/mod_g726 +codecs/mod_g726 #codecs/mod_g729 codecs/mod_gsm codecs/mod_ilbc Modified: freeswitch/trunk/conf/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/modules.conf.xml (original) +++ freeswitch/trunk/conf/modules.conf.xml Fri Oct 12 21:14:45 2007 @@ -45,6 +45,8 @@  <load module="mod_g711"/> + <load module="mod_g722"/> + <load module="mod_g726"/> <load module="mod_gsm"/>  <load module="mod_l16"/>

1 0

[commit] r5868 - in freeswitch/trunk: conf src/mod/applications/mod_voicemail
by Freeswitch SVN 13 Oct '07

13 Oct '07

Author: anthm Date: Fri Oct 12 20:52:31 2007 New Revision: 5868 Modified: freeswitch/trunk/conf/voicemail_en_tts.xml freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: update Modified: freeswitch/trunk/conf/voicemail_en_tts.xml ============================================================================== --- freeswitch/trunk/conf/voicemail_en_tts.xml (original) +++ freeswitch/trunk/conf/voicemail_en_tts.xml Fri Oct 12 20:52:31 2007 @@ -50,7 +50,7 @@ <macro name="voicemail_message_count"> <input pattern="^([^:]+):([^:]+):{0,1}(.*)"> <match> - <action function="speak-text" data="you have $1 $2 $3 messages in folder ${voicemail_current_folder}"/> + <action function="speak-text" data="you have $1 $2 message$3 in folder ${voicemail_current_folder}"/> </match> </input> </macro> Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Oct 12 20:52:31 2007 @@ -1037,13 +1037,13 @@ &total_new_urgent_messages, &total_saved_urgent_messages); if (total_new_urgent_messages > 0) { - snprintf(msg_count, sizeof(msg_count), "%d:urgent:new", total_new_messages); + snprintf(msg_count, sizeof(msg_count), "%d:urgent-new:%s", total_new_urgent_messages, total_new_urgent_messages == 1 ? "" : "s"); if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) { goto end; } } if (total_new_messages > 0) { - snprintf(msg_count, sizeof(msg_count), "%d:new", total_new_messages); + snprintf(msg_count, sizeof(msg_count), "%d:new:%s", total_new_messages, total_new_messages == 1 ? "" : "s"); if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) { goto end; } @@ -1057,14 +1057,14 @@ } if (total_saved_urgent_messages > 0) { - snprintf(msg_count, sizeof(msg_count), "%d:urgent:saved", total_saved_messages); + snprintf(msg_count, sizeof(msg_count), "%d:urgent-saved:%s", total_saved_urgent_messages, total_saved_urgent_messages == 1 ? "" : "s"); if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) { goto end; } } if (total_saved_messages > 0) { - snprintf(msg_count, sizeof(msg_count), "%d:saved", total_saved_messages); + snprintf(msg_count, sizeof(msg_count), "%d:saved:%s", total_saved_messages, total_saved_messages == 1 ? "" : "s"); if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) { goto end; } @@ -1509,6 +1509,9 @@ if (*profile->urgent_key == *input) { read_flags = URGENT_FLAG_STRING; priority = 1; + TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "marked-urgent", NULL, NULL)); + } else { + TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "saved", NULL, NULL)); } }

1 0

[commit] r5867 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 13 Oct '07

13 Oct '07

Author: anthm Date: Fri Oct 12 20:22:13 2007 New Revision: 5867 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: sort by urgent Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Oct 12 20:22:13 2007 @@ -598,7 +598,8 @@ #define VM_HELLO_MACRO "voicemail_hello" #define VM_GOODBYE_MACRO "voicemail_goodbye" #define VM_MESSAGE_COUNT_MACRO "voicemail_message_count" - +#define URGENT_FLAG_STRING "A_URGENT" +#define NORMAL_FLAG_STRING "B_NORMAL" static switch_status_t vm_macro_get(switch_core_session_t *session, @@ -880,7 +881,7 @@ char *body; int priority = 3; - if (!strcasecmp(cbt->read_flags, "urgent")) { + if (!strcasecmp(cbt->read_flags, URGENT_FLAG_STRING)) { priority = 1; } headers = switch_core_session_sprintf(session, @@ -938,10 +939,11 @@ *total_new_messages = atoi(msg_count); snprintf(sql, sizeof(sql), - "select count(*) from voicemail_data where user='%s' and domain='%s' and in_folder='%s' and read_epoch=0 and read_flags='urgent'", + "select count(*) from voicemail_data where user='%s' and domain='%s' and in_folder='%s' and read_epoch=0 and read_flags='%s'", myid, domain_name, - myfolder); + myfolder, + URGENT_FLAG_STRING); vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); *total_new_urgent_messages = atoi(msg_count); @@ -955,10 +957,11 @@ snprintf(sql, sizeof(sql), - "select count(*) from voicemail_data where user='%s' and domain='%s' and in_folder='%s' and read_epoch!=0 and read_flags='urgent'", + "select count(*) from voicemail_data where user='%s' and domain='%s' and in_folder='%s' and read_epoch!=0 and read_flags='%s'", myid, domain_name, - myfolder); + myfolder, + URGENT_FLAG_STRING); vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); *total_saved_urgent_messages = atoi(msg_count); @@ -1090,7 +1093,7 @@ case MSG_NEW: { snprintf(sql, sizeof(sql), - "select * from voicemail_data where user='%s' and domain='%s' and read_epoch=0", myid, domain_name); + "select * from voicemail_data where user='%s' and domain='%s' and read_epoch=0 order by read_flags", myid, domain_name); total_messages = total_new_messages; heard_auto_new = heard_auto_saved = 1; } @@ -1099,7 +1102,7 @@ default: { snprintf(sql, sizeof(sql), - "select * from voicemail_data where user='%s' and domain='%s' and read_epoch!=0", myid, domain_name); + "select * from voicemail_data where user='%s' and domain='%s' and read_epoch !=0 order by read_flags", myid, domain_name); total_messages = total_saved_messages; heard_auto_new = heard_auto_saved = 1; } @@ -1407,7 +1410,7 @@ char *email_vm = NULL; int send_mail = 0; cc_t cc = { 0 }; - char *read_flags = ""; + char *read_flags = NORMAL_FLAG_STRING; int priority = 3; memset(&cbt, 0, sizeof(cbt)); @@ -1504,7 +1507,7 @@ vm_macro_get(session, VM_RECORD_URGENT_CHECK_MACRO, key_buf, input, sizeof(input), 1, profile->terminator_key, &term, profile->digit_timeout); if (*profile->urgent_key == *input) { - read_flags = "urgent"; + read_flags = URGENT_FLAG_STRING; priority = 1; } }

1 0

[commit] r5866 - in freeswitch/trunk: build conf
by Freeswitch SVN 13 Oct '07

13 Oct '07

Author: brian Date: Fri Oct 12 20:21:31 2007 New Revision: 5866 Modified: freeswitch/trunk/build/modules.conf.in freeswitch/trunk/conf/modules.conf.xml Log: add mod_voicemail to default build Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Fri Oct 12 20:21:31 2007 @@ -5,7 +5,7 @@ applications/mod_dptools applications/mod_enum applications/mod_fifo -#applications/mod_voicemail +applications/mod_voicemail #applications/mod_ivrtest #applications/mod_soundtouch #applications/mod_rss Modified: freeswitch/trunk/conf/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/modules.conf.xml (original) +++ freeswitch/trunk/conf/modules.conf.xml Fri Oct 12 20:21:31 2007 @@ -37,7 +37,7 @@ <load module="mod_conference"/> <load module="mod_dptools"/> <load module="mod_fifo"/> -  + <load module="mod_voicemail"/>

1 0

[commit] r5865 - freeswitch/trunk/conf
by Freeswitch SVN 12 Oct '07

12 Oct '07

Author: brian Date: Fri Oct 12 19:59:23 2007 New Revision: 5865 Modified: freeswitch/trunk/conf/default_context.xml Log: Add FreeNUM ISN lookup example, Thanks [intra]lanman Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Fri Oct 12 19:59:23 2007 @@ -50,8 +50,6 @@ </condition> </extension> - - <extension name="9192"> <condition field="destination_number" expression="^9192$">  @@ -61,6 +59,14 @@ </condition> </extension> +  + <extension name="ISN_Lookup"> + <condition field="destination_number" expression="^([0-9]*)\*([0-9]*)$"> + <action application="enum" data="$1 $2.freenum.org"/> + <action application="log" data="${enum_auto_route}"/> + <action application="bridge" data="${enum_auto_route}"/> + </condition> + </extension>  <extension name="9191">

1 0