- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

[commit] r5864 - freeswitch/trunk/src
by Freeswitch SVN 12 Oct '07

12 Oct '07

Author: brian Date: Fri Oct 12 19:53:32 2007 New Revision: 5864 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: temp tweak pending build system change Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Fri Oct 12 19:53:32 2007 @@ -663,7 +663,7 @@ #ifdef WIN32 status = switch_dso_load(&dso, "FreeSwitch.dll", loadable_modules.pool); #elif defined (MACOSX) || defined(DARWIN) - status = switch_dso_load(&dso, "libfreeswitch.dylib", loadable_modules.pool); + status = switch_dso_load(&dso, SWITCH_PREFIX_DIR "/lib/libfreeswitch.dylib", loadable_modules.pool); #else status = switch_dso_load(&dso, NULL, loadable_modules.pool); #endif

1 0

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

12 Oct '07

Author: brian Date: Fri Oct 12 19:50:14 2007 New Revision: 5863 Modified: freeswitch/trunk/conf/modules.conf.xml Log: tweak default config Modified: freeswitch/trunk/conf/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/modules.conf.xml (original) +++ freeswitch/trunk/conf/modules.conf.xml Fri Oct 12 19:50:14 2007 @@ -25,9 +25,9 @@   -  - <load module="mod_portaudio"/> - <load module="mod_alsa"/> +  +  +  <load module="mod_sofia"/>

1 0

[commit] r5862 - freeswitch/trunk/src/mod/applications/mod_enum
by Freeswitch SVN 12 Oct '07

12 Oct '07

Author: anthm Date: Fri Oct 12 19:49:43 2007 New Revision: 5862 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: make compares case insensitive Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Fri Oct 12 19:49:43 2007 @@ -223,17 +223,17 @@ rp = q->results; - while (rp && strcmp(rp->service, new_result->service)) { + while (rp && strcasecmp(rp->service, new_result->service)) { prev = rp; rp = rp->next; } - while (rp && !strcmp(rp->service, new_result->service) && new_result->order > rp->order) { + while (rp && !strcasecmp(rp->service, new_result->service) && new_result->order > rp->order) { prev = rp; rp = rp->next; } - while (rp && !strcmp(rp->service, new_result->service) && new_result->preference > rp->preference) { + while (rp && !strcasecmp(rp->service, new_result->service) && new_result->preference > rp->preference) { prev = rp; rp = rp->next; } @@ -541,7 +541,7 @@ for (rtp = globals.route_order; rtp; rtp = rtp->next) { for (rp = results; rp; rp = rp->next) { - if (!strcmp(rtp->service, rp->service)) { + if (!strcasecmp(rtp->service, rp->service)) { switch_caller_extension_add_application(session, extension, "bridge", rp->route); } } @@ -596,7 +596,7 @@ for (rtp = globals.route_order; rtp; rtp = rtp->next) { for (rp = results; rp; rp = rp->next) { - if (!strcmp(rtp->service, rp->service)) { + if (!strcasecmp(rtp->service, rp->service)) { snprintf(vbuf, sizeof(vbuf), "enum_route_%d", cnt++); switch_channel_set_variable(channel, vbuf, rp->route); @@ -661,7 +661,7 @@ for (rtp = globals.route_order; rtp; rtp = rtp->next) { for (rp = results; rp; rp = rp->next) { - if (!strcmp(rtp->service, rp->service)) { + if (!strcasecmp(rtp->service, rp->service)) { stream->write_function(stream, "%d\t%d\t%-10s\t%s\n", rp->order, rp->preference, rp->service, rp->route); } }

1 0

[commit] r5861 - freeswitch/trunk/src
by Freeswitch SVN 12 Oct '07

12 Oct '07

Author: anthm Date: Fri Oct 12 19:34:30 2007 New Revision: 5861 Modified: freeswitch/trunk/src/softtimer.c Log: add missing ifdef but we cant leave this here Modified: freeswitch/trunk/src/softtimer.c ============================================================================== --- freeswitch/trunk/src/softtimer.c (original) +++ freeswitch/trunk/src/softtimer.c Fri Oct 12 19:34:30 2007 @@ -48,8 +48,10 @@ switch_mutex_t *mutex; } globals; +#ifdef WIN32 #undef SWITCH_MOD_DECLARE_DATA #define SWITCH_MOD_DECLARE_DATA __declspec(dllexport) +#endif SWITCH_MODULE_LOAD_FUNCTION(softtimer_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown);

1 0

[commit] r5860 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 12 Oct '07

12 Oct '07

Author: anthm Date: Fri Oct 12 19:22:02 2007 New Revision: 5860 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Oct 12 19:22:02 2007 @@ -161,9 +161,11 @@ nh = nua_handle(profile->nua, NULL, SIPTAG_FROM_STR(profile->url), SIPTAG_TO_STR(to), NUTAG_URL(contact), SIPTAG_CONTACT_STR(profile->url), TAG_END()); - nua_message(nh, SIPTAG_CONTENT_TYPE_STR("text/plain"), - SIPTAG_PAYLOAD_STR("You suffer from Connectile Dysfunction.\nYou should use stun....\n"), TAG_END()); + //nua_message(nh, SIPTAG_CONTENT_TYPE_STR("text/plain"), + //SIPTAG_PAYLOAD_STR("You suffer from Connectile Dysfunction.\nYou should use stun....\n"), TAG_END()); + nua_options(nh, SIPTAG_FROM_STR(profile->url), SIPTAG_TO_STR(to), NUTAG_URL(contact), SIPTAG_CONTACT_STR(profile->url), TAG_END()); + return 0; }

1 0

[commit] r5859 - freeswitch/trunk/src
by Freeswitch SVN 12 Oct '07

12 Oct '07

Author: brian Date: Fri Oct 12 18:56:15 2007 New Revision: 5859 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: add MAC OS X Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Fri Oct 12 18:56:15 2007 @@ -662,7 +662,7 @@ #ifdef WIN32 status = switch_dso_load(&dso, "FreeSwitch.dll", loadable_modules.pool); -#elif defined(DARWIN) +#elif defined (MACOSX) || defined(DARWIN) status = switch_dso_load(&dso, "libfreeswitch.dylib", loadable_modules.pool); #else status = switch_dso_load(&dso, NULL, loadable_modules.pool);

1 0