kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-19 22:18:19 +00:00
Code Issues Projects Releases Wiki Activity

add urgentness

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5855 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-10-12 22:08:30 +00:00
parent cf58dd44fe
commit 09d42df7c6
5 changed files with 346 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/voicemail.conf.xml
View File

@ -23,6 +23,10 @@
<param name="delete-file-key" value="7"/> <param name="delete-file-key" value="7"/>
<param name="undelete-file-key" value="8"/> <param name="undelete-file-key" value="8"/>
<param name="email-key" value="4"/> <param name="email-key" value="4"/>
<param name="pause-key" value="0"/>
<param name="restart-key" value="1"/>
<param name="ff-key" value="6"/>
<param name="rew-key" value="4"/>
<!--<param name="odbc-dsn" value="dsn:user:pass"/>--> <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
</profile> </profile>
</profiles> </profiles>

26
conf/voicemail_en_tts.xml
View File

@ -47,23 +47,14 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_new_message_count"> <macro name="voicemail_message_count">
<input pattern="(.*)"> <input pattern="^([^:]+):([^:]+):{0,1}(.*)">
<match> <match>
<action function="speak-text" data="you have $1 new messages in folder ${voicemail_current_folder}"/> <action function="speak-text" data="you have $1 $2 $3 messages in folder ${voicemail_current_folder}"/>
</match> </match>
</input> </input>
</macro> </macro>
<macro name="voicemail_saved_message_count">
<input pattern="(.*)">
<match>
<action function="speak-text" data="you have $1 saved messages in folder ${voicemail_current_folder}"/>
</match>
</input>
</macro>
<macro name="voicemail_menu"> <macro name="voicemail_menu">
<input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
<match> <match>
@ -102,6 +93,15 @@
</input> </input>
</macro> </macro>
<macro name="voicemail_record_urgent_check">
<input pattern="^([0-9#*]):([0-9#*])$">
<match>
<action function="speak-text"
data="press $1 to mark this message urgent or press $2 to continue"/>
</match>
</input>
</macro>
<macro name="voicemail_listen_file_check"> <macro name="voicemail_listen_file_check">
<input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
<match> <match>
@ -202,7 +202,7 @@
<macro name="voicemail_say_date"> <macro name="voicemail_say_date">
<input pattern="^(.*)$"> <input pattern="^(.*)$">
<match> <match>
<action function="speak-text" data="$strftime($1|%A, %B %d %Y, %I %m %p)"/> <action function="speak-text" data="$strftime($1|%A, %B %d %Y, %I %M %p)"/>
</match> </match>
</input> </input>
</macro> </macro>

387
src/mod/applications/mod_voicemail/mod_voicemail.c
View File

@ -72,6 +72,11 @@ struct vm_profile {
char delete_file_key[2]; char delete_file_key[2];
char undelete_file_key[2]; char undelete_file_key[2];
char email_key[2]; char email_key[2];
char pause_key[2];
char restart_key[2];
char ff_key[2];
char rew_key[2];
char urgent_key[2];
char file_ext[10]; char file_ext[10];
char *tone_spec; char *tone_spec;
uint32_t digit_timeout; uint32_t digit_timeout;
@ -200,7 +205,8 @@ static char vm_sql[] =
" cid_number VARCHAR(255),\n" " cid_number VARCHAR(255),\n"
" in_folder VARCHAR(255),\n" " in_folder VARCHAR(255),\n"
" file_path VARCHAR(255),\n" " file_path VARCHAR(255),\n"
" flags VARCHAR(255)\n" " flags VARCHAR(255),\n"
" read_flags VARCHAR(255)\n"
");\n"; ");\n";
@ -264,6 +270,11 @@ static switch_status_t load_config(void)
char *delete_file_key = "7"; char *delete_file_key = "7";
char *undelete_file_key = "8"; char *undelete_file_key = "8";
char *email_key = "4"; char *email_key = "4";
char *pause_key = "0";
char *restart_key = "1";
char *ff_key = "6";
char *rew_key = "4";
char *urgent_key = "*";
char *tone_spec = "%(1000, 0, 640)"; char *tone_spec = "%(1000, 0, 640)";
char *file_ext = "wav"; char *file_ext = "wav";
@ -303,6 +314,16 @@ static switch_status_t load_config(void)
undelete_file_key = val; undelete_file_key = val;
} else if (!strcasecmp(var, "email-key") && !switch_strlen_zero(val)) { } else if (!strcasecmp(var, "email-key") && !switch_strlen_zero(val)) {
email_key = val; email_key = val;
} else if (!strcasecmp(var, "pause-key") && !switch_strlen_zero(val)) {
pause_key = val;
} else if (!strcasecmp(var, "restart-key") && !switch_strlen_zero(val)) {
restart_key = val;
} else if (!strcasecmp(var, "ff-key") && !switch_strlen_zero(val)) {
ff_key = val;
} else if (!strcasecmp(var, "rew-key") && !switch_strlen_zero(val)) {
rew_key = val;
} else if (!strcasecmp(var, "urgent-key") && !switch_strlen_zero(val)) {
urgent_key = val;
} else if (!strcasecmp(var, "file-extension")) { } else if (!strcasecmp(var, "file-extension")) {
file_ext = val; file_ext = val;
} else if (!strcasecmp(var, "tone-spec")) { } else if (!strcasecmp(var, "tone-spec")) {
@ -410,6 +431,12 @@ static switch_status_t load_config(void)
*profile->delete_file_key = *delete_file_key; *profile->delete_file_key = *delete_file_key;
*profile->undelete_file_key = *undelete_file_key; *profile->undelete_file_key = *undelete_file_key;
*profile->email_key = *email_key; *profile->email_key = *email_key;
*profile->pause_key = *pause_key;
*profile->restart_key = *restart_key;
*profile->ff_key = *ff_key;
*profile->rew_key = *rew_key;
*profile->urgent_key = *urgent_key;
profile->tone_spec = switch_core_strdup(globals.pool, tone_spec); profile->tone_spec = switch_core_strdup(globals.pool, tone_spec);
switch_copy_string(profile->file_ext, file_ext, sizeof(profile->file_ext)); switch_copy_string(profile->file_ext, file_ext, sizeof(profile->file_ext));
switch_mutex_init(&profile->mutex, SWITCH_MUTEX_NESTED, globals.pool); switch_mutex_init(&profile->mutex, SWITCH_MUTEX_NESTED, globals.pool);
@ -451,6 +478,13 @@ static switch_status_t cancel_on_dtmf(switch_core_session_t *session, void *inpu
} }
struct call_control {
vm_profile_t *profile;
switch_file_handle_t *fh;
char buf[4];
};
typedef struct call_control cc_t;
static switch_status_t control_playback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) static switch_status_t control_playback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)
{ {
@ -459,48 +493,48 @@ static switch_status_t control_playback(switch_core_session_t *session, void *in
case SWITCH_INPUT_TYPE_DTMF: case SWITCH_INPUT_TYPE_DTMF:
{ {
char *dtmf = (char *) input; char *dtmf = (char *) input;
switch_file_handle_t *fh = (switch_file_handle_t *) buf; cc_t *cc = (cc_t *) buf;
switch_file_handle_t *fh = cc->fh;
uint32_t pos = 0; uint32_t pos = 0;
switch(*dtmf) { if (*dtmf == *cc->profile->delete_file_key || *dtmf == *cc->profile->save_file_key) {
case '0': *cc->buf = *dtmf;
{
if (switch_test_flag(fh, SWITCH_FILE_PAUSE)) {
switch_clear_flag(fh, SWITCH_FILE_PAUSE);
} else {
switch_set_flag(fh, SWITCH_FILE_PAUSE);
}
return SWITCH_STATUS_SUCCESS;
}
break;
case '1':
{
unsigned int pos = 0;
fh->speed = 0;
switch_core_file_seek(fh, &pos, 0, SEEK_SET);
return SWITCH_STATUS_SUCCESS;
}
break;
case '6':
{
int samps = 24000;
switch_core_file_seek(fh, &pos, samps, SEEK_CUR);
return SWITCH_STATUS_SUCCESS;
}
break;
case '4':
{
int samps = 24000;
switch_core_file_seek(fh, &pos, fh->pos - samps, SEEK_SET);
return SWITCH_STATUS_SUCCESS;
}
break;
case '#':
return SWITCH_STATUS_BREAK; return SWITCH_STATUS_BREAK;
}
default: if (!fh) {
return SWITCH_STATUS_SUCCESS; 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);
} else {
switch_set_flag(fh, SWITCH_FILE_PAUSE);
}
return SWITCH_STATUS_SUCCESS;
}
if (*dtmf == *cc->profile->restart_key) {
unsigned int pos = 0;
fh->speed = 0;
switch_core_file_seek(fh, &pos, 0, SEEK_SET);
return SWITCH_STATUS_SUCCESS;
}
if (*dtmf == *cc->profile->ff_key) {
int samps = 24000;
switch_core_file_seek(fh, &pos, samps, SEEK_CUR);
return SWITCH_STATUS_SUCCESS;
}
if (*dtmf == *cc->profile->rew_key) {
int samps = 24000;
switch_core_file_seek(fh, &pos, fh->pos - samps, SEEK_SET);
return SWITCH_STATUS_SUCCESS;
}
if (*dtmf == *cc->profile->terminator_key) {
return SWITCH_STATUS_BREAK;
}
} }
break; break;
default: default:
@ -554,6 +588,7 @@ typedef enum {
#define VM_RECORD_NAME_MACRO "voicemail_record_name" #define VM_RECORD_NAME_MACRO "voicemail_record_name"
#define VM_LISTEN_FILE_CHECK_MACRO "voicemail_listen_file_check" #define VM_LISTEN_FILE_CHECK_MACRO "voicemail_listen_file_check"
#define VM_RECORD_FILE_CHECK_MACRO "voicemail_record_file_check" #define VM_RECORD_FILE_CHECK_MACRO "voicemail_record_file_check"
#define VM_RECORD_URGENT_CHECK_MACRO "voicemail_record_urgent_check"
#define VM_MENU_MACRO "voicemail_menu" #define VM_MENU_MACRO "voicemail_menu"
#define VM_CONFIG_MENU_MACRO "voicemail_config_menu" #define VM_CONFIG_MENU_MACRO "voicemail_config_menu"
#define VM_ENTER_ID_MACRO "voicemail_enter_id" #define VM_ENTER_ID_MACRO "voicemail_enter_id"
@ -562,8 +597,8 @@ typedef enum {
#define VM_ABORT_MACRO "voicemail_abort" #define VM_ABORT_MACRO "voicemail_abort"
#define VM_HELLO_MACRO "voicemail_hello" #define VM_HELLO_MACRO "voicemail_hello"
#define VM_GOODBYE_MACRO "voicemail_goodbye" #define VM_GOODBYE_MACRO "voicemail_goodbye"
#define VM_NEW_MESSAGE_COUNT_MACRO "voicemail_new_message_count" #define VM_MESSAGE_COUNT_MACRO "voicemail_message_count"
#define VM_SAVED_MESSAGE_COUNT_MACRO "voicemail_saved_message_count"
static switch_status_t vm_macro_get(switch_core_session_t *session, static switch_status_t vm_macro_get(switch_core_session_t *session,
@ -585,7 +620,7 @@ static switch_status_t vm_macro_get(switch_core_session_t *session,
assert(channel != NULL); assert(channel != NULL);
if (buf && buflen) { if (buf && buflen) {
*buf = '\0'; memset(buf, 0, buflen);
args.input_callback = cancel_on_dtmf; args.input_callback = cancel_on_dtmf;
args.buf = buf; args.buf = buf;
args.buflen = sizeof(buf); args.buflen = sizeof(buf);
@ -660,6 +695,7 @@ static switch_status_t create_file(switch_core_session_t *session, vm_profile_t
switch_input_args_t args = { 0 }; switch_input_args_t args = { 0 };
char term; char term;
char input[10] = "" , key_buf[80] = ""; char input[10] = "" , key_buf[80] = "";
cc_t cc = { 0 };
channel = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
assert(channel != NULL); assert(channel != NULL);
@ -696,13 +732,23 @@ static switch_status_t create_file(switch_core_session_t *session, vm_profile_t
play_file: play_file:
memset(&fh, 0, sizeof(fh)); memset(&fh, 0, sizeof(fh));
args.input_callback = control_playback; args.input_callback = control_playback;
args.buf = &fh; memset(&cc, 0, sizeof(cc));
cc.profile = profile;
cc.fh = &fh;
args.buf = &cc;
switch_ivr_play_file(session, &fh, file_path, &args); switch_ivr_play_file(session, &fh, file_path, &args);
while(switch_channel_ready(channel)) { while(switch_channel_ready(channel)) {
status = vm_macro_get(session, VM_RECORD_FILE_CHECK_MACRO, if (*cc.buf) {
key_buf, input, sizeof(input), 1, profile->terminator_key, &term, profile->digit_timeout); *input = *cc.buf;
*(input+1) = '\0';
status = SWITCH_STATUS_SUCCESS;
*cc.buf = '\0';
} else {
status = vm_macro_get(session, VM_RECORD_FILE_CHECK_MACRO,
key_buf, input, sizeof(input), 1, profile->terminator_key, &term, profile->digit_timeout);
}
if (!strcmp(input, profile->listen_file_key)) { if (!strcmp(input, profile->listen_file_key)) {
goto play_file; goto play_file;
@ -732,6 +778,7 @@ struct listen_callback {
char in_folder[255]; char in_folder[255];
char file_path[255]; char file_path[255];
char flags[255]; char flags[255];
char read_flags[255];
char *email; char *email;
int index; int index;
int want; int want;
@ -757,6 +804,7 @@ static int listen_callback(void *pArg, int argc, char **argv, char **columnNames
switch_copy_string(cbt->in_folder, argv[7], 255); switch_copy_string(cbt->in_folder, argv[7], 255);
switch_copy_string(cbt->file_path, argv[8], 255); switch_copy_string(cbt->file_path, argv[8], 255);
switch_copy_string(cbt->flags, argv[9], 255); switch_copy_string(cbt->flags, argv[9], 255);
switch_copy_string(cbt->read_flags, argv[10], 255);
return -1; return -1;
@ -771,6 +819,7 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
char term; char term;
char input[10] = "" , key_buf[80] = ""; char input[10] = "" , key_buf[80] = "";
switch_file_handle_t fh = { 0 }; switch_file_handle_t fh = { 0 };
cc_t cc = { 0 };
channel = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
assert(channel != NULL); assert(channel != NULL);
@ -787,20 +836,37 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
profile->email_key); profile->email_key);
snprintf(input, sizeof(input), "%s:%d", cbt->type == MSG_NEW ? "new" : "saved", cbt->index); snprintf(input, sizeof(input), "%s:%d", cbt->type == MSG_NEW ? "new" : "saved", cbt->want+1);
TRY_CODE(switch_ivr_phrase_macro(session, VM_SAY_MESSAGE_NUMBER_MACRO, input, NULL, NULL)); memset(&cc, 0, sizeof(cc));
TRY_CODE(switch_ivr_phrase_macro(session, VM_SAY_DATE_MACRO, cbt->created_epoch, NULL, NULL)); cc.profile = profile;
args.buf = &cc;
args.input_callback = control_playback;
TRY_CODE(switch_ivr_phrase_macro(session, VM_SAY_MESSAGE_NUMBER_MACRO, input, NULL, &args));
if (!*cc.buf) {
TRY_CODE(switch_ivr_phrase_macro(session, VM_SAY_DATE_MACRO, cbt->created_epoch, NULL, &args));
}
play_file: play_file:
memset(&fh, 0, sizeof(fh)); if (!*cc.buf) {
args.input_callback = control_playback; memset(&fh, 0, sizeof(fh));
args.buf = &fh; args.input_callback = control_playback;
TRY_CODE(switch_ivr_play_file(session, NULL, cbt->file_path, &args)); memset(&cc, 0, sizeof(cc));
cc.profile = profile;
cc.fh = &fh;
args.buf = &cc;
TRY_CODE(switch_ivr_play_file(session, NULL, cbt->file_path, &args));
}
if (switch_channel_ready(channel)) { if (switch_channel_ready(channel)) {
status = vm_macro_get(session, VM_LISTEN_FILE_CHECK_MACRO, if (*cc.buf) {
key_buf, input, sizeof(input), 1, profile->terminator_key, &term, profile->digit_timeout); *input = *cc.buf;
*(input+1) = '\0';
status = SWITCH_STATUS_SUCCESS;
*cc.buf = '\0';
} else {
status = vm_macro_get(session, VM_LISTEN_FILE_CHECK_MACRO,
key_buf, input, sizeof(input), 1, profile->terminator_key, &term, profile->digit_timeout);
}
if (!strcmp(input, profile->listen_file_key)) { if (!strcmp(input, profile->listen_file_key)) {
goto play_file; goto play_file;
} else if (!strcmp(input, profile->delete_file_key) || !strcmp(input, profile->email_key)) { } else if (!strcmp(input, profile->delete_file_key) || !strcmp(input, profile->email_key)) {
@ -810,11 +876,16 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
if (!strcmp(input, profile->email_key) && !switch_strlen_zero(cbt->email)) { if (!strcmp(input, profile->email_key) && !switch_strlen_zero(cbt->email)) {
switch_event_t *event; switch_event_t *event;
char *from = switch_core_session_sprintf(session, "%s@%s", cbt->user, cbt->domain); char *from = switch_core_session_sprintf(session, "%s@%s", cbt->user, cbt->domain);
char *headers = switch_core_session_sprintf(session, "From: FreeSWITCH mod_voicemail <%s@%s>\nSubject: Voicemail from %s %s", char *headers;
cbt->user, cbt->domain, cbt->cid_name, cbt->cid_number);
char *body; char *body;
int priority = 3;
if (!strcasecmp(cbt->read_flags, "urgent")) {
priority = 1;
}
headers = switch_core_session_sprintf(session,
"From: FreeSWITCH mod_voicemail <%s@%s>\nSubject: Voicemail from %s %s\nX-Priority: %d",
cbt->user, cbt->domain, cbt->cid_name, cbt->cid_number, priority);
if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Type", "forwarded-voicemail"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Type", "forwarded-voicemail");
@ -847,7 +918,8 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
return status; return status;
} }
static void message_count(vm_profile_t *profile, char *myid, char *domain_name, char *myfolder, int *total_new_messages, int *total_saved_messages) static void message_count(vm_profile_t *profile, char *myid, char *domain_name, char *myfolder,
int *total_new_messages, int *total_saved_messages, int *total_new_urgent_messages, int *total_saved_urgent_messages)
{ {
char msg_count[80] = ""; char msg_count[80] = "";
callback_t cbt = { 0 }; callback_t cbt = { 0 };
@ -865,6 +937,14 @@ static void message_count(vm_profile_t *profile, char *myid, char *domain_name,
vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt);
*total_new_messages = atoi(msg_count); *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'",
myid,
domain_name,
myfolder);
vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt);
*total_new_urgent_messages = atoi(msg_count);
snprintf(sql, sizeof(sql), snprintf(sql, sizeof(sql),
"select count(*) from voicemail_data where user='%s' and domain='%s' and in_folder='%s' and read_epoch!=0", "select count(*) from voicemail_data where user='%s' and domain='%s' and in_folder='%s' and read_epoch!=0",
myid, myid,
@ -872,6 +952,16 @@ static void message_count(vm_profile_t *profile, char *myid, char *domain_name,
myfolder); myfolder);
vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt);
*total_saved_messages = atoi(msg_count); *total_saved_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'",
myid,
domain_name,
myfolder);
vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt);
*total_saved_urgent_messages = atoi(msg_count);
} }
@ -891,6 +981,8 @@ static void voicemail_check_main(switch_core_session_t *session, char *profile_n
char *dir_path = NULL, *file_path = NULL; char *dir_path = NULL, *file_path = NULL;
int total_new_messages = 0; int total_new_messages = 0;
int total_saved_messages = 0; int total_saved_messages = 0;
int total_new_urgent_messages = 0;
int total_saved_urgent_messages = 0;
int heard_auto_saved = 0, heard_auto_new = 0; int heard_auto_saved = 0, heard_auto_new = 0;
char *email_vm = NULL; char *email_vm = NULL;
channel = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
@ -918,6 +1010,8 @@ static void voicemail_check_main(switch_core_session_t *session, char *profile_n
{ {
total_new_messages = 0; total_new_messages = 0;
total_saved_messages = 0; total_saved_messages = 0;
total_new_urgent_messages = 0;
total_saved_urgent_messages = 0;
heard_auto_saved = 0; heard_auto_saved = 0;
heard_auto_new = 0; heard_auto_new = 0;
play_msg_type = MSG_NONE; play_msg_type = MSG_NONE;
@ -936,10 +1030,20 @@ static void voicemail_check_main(switch_core_session_t *session, char *profile_n
{ {
char msg_count[80] = ""; char msg_count[80] = "";
switch_channel_set_variable(channel, "voicemail_current_folder", myfolder); switch_channel_set_variable(channel, "voicemail_current_folder", myfolder);
message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages); message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages,
snprintf(msg_count, sizeof(msg_count), "%d", total_new_messages); &total_new_urgent_messages, &total_saved_urgent_messages);
if ((status = switch_ivr_phrase_macro(session, VM_NEW_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) {
goto end; if (total_new_urgent_messages > 0) {
snprintf(msg_count, sizeof(msg_count), "%d:urgent:new", total_new_messages);
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);
if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) {
goto end;
}
} }
if (!heard_auto_new && total_new_messages > 0) { if (!heard_auto_new && total_new_messages > 0) {
@ -949,9 +1053,18 @@ static void voicemail_check_main(switch_core_session_t *session, char *profile_n
continue; continue;
} }
snprintf(msg_count, sizeof(msg_count), "%d", total_saved_messages); if (total_saved_urgent_messages > 0) {
if ((status = switch_ivr_phrase_macro(session, VM_SAVED_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) { snprintf(msg_count, sizeof(msg_count), "%d:urgent:saved", total_saved_messages);
goto end; 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);
if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) {
goto end;
}
} }
if (!heard_auto_saved && total_saved_messages > 0) { if (!heard_auto_saved && total_saved_messages > 0) {
@ -969,7 +1082,8 @@ static void voicemail_check_main(switch_core_session_t *session, char *profile_n
listen_callback_t cbt; listen_callback_t cbt;
char sql[256]; char sql[256];
int cur_message, total_messages; int cur_message, total_messages;
message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages); message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages,
&total_new_urgent_messages, &total_saved_urgent_messages);
memset(&cbt, 0, sizeof(cbt)); memset(&cbt, 0, sizeof(cbt));
cbt.email = email_vm; cbt.email = email_vm;
switch(play_msg_type) { switch(play_msg_type) {
@ -1018,6 +1132,7 @@ static void voicemail_check_main(switch_core_session_t *session, char *profile_n
char key_buf[80] = ""; char key_buf[80] = "";
callback_t cbt = { 0 }; callback_t cbt = { 0 };
char msg_count[80] = ""; char msg_count[80] = "";
cc_t cc = { 0 };
cbt.buf = msg_count; cbt.buf = msg_count;
cbt.len = sizeof(msg_count); cbt.len = sizeof(msg_count);
sql = switch_mprintf("select count(*) from voicemail_prefs where user='%q' and domain = '%q'", myid, domain_name); sql = switch_mprintf("select count(*) from voicemail_prefs where user='%q' and domain = '%q'", myid, domain_name);
@ -1060,7 +1175,10 @@ static void voicemail_check_main(switch_core_session_t *session, char *profile_n
switch_file_handle_t fh = { 0 }; switch_file_handle_t fh = { 0 };
memset(&fh, 0, sizeof(fh)); memset(&fh, 0, sizeof(fh));
args.input_callback = control_playback; args.input_callback = control_playback;
args.buf = &fh; memset(&cc, 0, sizeof(cc));
cc.profile = profile;
cc.fh = &fh;
args.buf = &cc;
status = switch_ivr_play_file(session, NULL, file_path, &args); status = switch_ivr_play_file(session, NULL, file_path, &args);
} }
if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
@ -1288,6 +1406,9 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, char
switch_input_args_t args = { 0 }; switch_input_args_t args = { 0 };
char *email_vm = NULL; char *email_vm = NULL;
int send_mail = 0; int send_mail = 0;
cc_t cc = { 0 };
char *read_flags = "";
int priority = 3;
memset(&cbt, 0, sizeof(cbt)); memset(&cbt, 0, sizeof(cbt));
if (!(profile = switch_core_hash_find(globals.profile_hash, profile_name))) { if (!(profile = switch_core_hash_find(globals.profile_hash, profile_name))) {
@ -1358,7 +1479,10 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, char
memset(&fh, 0, sizeof(fh)); memset(&fh, 0, sizeof(fh));
args.input_callback = control_playback; args.input_callback = control_playback;
args.buf = &fh; memset(&cc, 0, sizeof(cc));
cc.profile = profile;
cc.fh = &fh;
args.buf = &cc;
if (!switch_strlen_zero(cbt.greeting_path)) { if (!switch_strlen_zero(cbt.greeting_path)) {
TRY_CODE(switch_ivr_play_file(session, NULL, cbt.greeting_path, NULL)); TRY_CODE(switch_ivr_play_file(session, NULL, cbt.greeting_path, NULL));
@ -1369,29 +1493,64 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, char
TRY_CODE(switch_ivr_phrase_macro(session, VM_PLAY_GREETING_MACRO, id, NULL, NULL)); TRY_CODE(switch_ivr_phrase_macro(session, VM_PLAY_GREETING_MACRO, id, NULL, NULL));
} }
if(!send_mail && switch_channel_ready(channel)) {
char *usql;
status = create_file(session, profile, VM_RECORD_MESSAGE_MACRO, file_path); status = create_file(session, profile, VM_RECORD_MESSAGE_MACRO, file_path);
if (status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK) {
usql = switch_mprintf("insert into voicemail_data values(%ld,0,'%q','%q','%q','%q','%q','%q','%q','')", (long)time(NULL), if ((status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK) && switch_channel_ready(channel)) {
id, domain_name, uuid, caller_profile->caller_id_name, caller_profile->caller_id_number, myfolder, file_path); char input[10] = "", key_buf[80] = "", term = 0;
vm_execute_sql(profile, usql, profile->mutex);
switch_safe_free(usql); snprintf(key_buf, sizeof(key_buf), "%s:%s",
} else { profile->urgent_key,
unlink(file_path); profile->terminator_key);
goto end;
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";
priority = 1;
}
} }
} if(!send_mail) {
char *usql;
switch_event_t *event;
char *mwi_id = NULL;
int total_new_messages = 0;
int total_saved_messages = 0;
int total_new_urgent_messages = 0;
int total_saved_urgent_messages = 0;
usql = switch_mprintf("insert into voicemail_data values(%ld,0,'%q','%q','%q','%q','%q','%q','%q','','%q')", (long)time(NULL),
id, domain_name, uuid, caller_profile->caller_id_name, caller_profile->caller_id_number, myfolder, file_path, read_flags);
vm_execute_sql(profile, usql, profile->mutex);
switch_safe_free(usql);
message_count(profile, id, domain_name, myfolder, &total_new_messages, &total_saved_messages,
&total_new_urgent_messages, &total_saved_urgent_messages);
if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) {
mwi_id = switch_mprintf("%s@%s", id, domain_name);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "yes");
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", mwi_id);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)",
total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages);
switch_event_fire(&event);
switch_safe_free(mwi_id);
}
}
end: end:
if (send_mail && !switch_strlen_zero(email_vm)) { if (send_mail && !switch_strlen_zero(email_vm)) {
switch_event_t *event; switch_event_t *event;
char *from = switch_core_session_sprintf(session, "%s@%s", id, domain_name); char *from = switch_core_session_sprintf(session, "%s@%s", id, domain_name);
char *headers = switch_core_session_sprintf(session, "From: FreeSWITCH mod_voicemail <%s@%s>\nSubject: Voicemail from %s %s", id, domain_name,
caller_profile->caller_id_name, caller_profile->caller_id_number);
char *body; char *body;
char *headers;
headers = switch_core_session_sprintf(session, "From: FreeSWITCH mod_voicemail <%s@%s>\nSubject: Voicemail from %s %s\nX-Priority: %d",
id, domain_name,
caller_profile->caller_id_name,
caller_profile->caller_id_number,
priority);
if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
@ -1502,6 +1661,65 @@ SWITCH_STANDARD_APP(voicemail_function)
} }
} }
static void message_query_handler(switch_event_t *event)
{
char *account = switch_event_get_header(event, "message-account");
int sent = 0;
switch_event_t *new_event = NULL;
if (account) {
switch_hash_index_t *hi;
int total_new_messages = 0;
int total_saved_messages = 0;
int total_new_urgent_messages = 0;
int total_saved_urgent_messages = 0;
void *val;
vm_profile_t *profile;
char *id, *domain;
if (!strncasecmp(account, "sip:", 4)) {
id = strdup(account + 4);
} else {
id = strdup(account);
}
assert(id);
if ((domain = strchr(id, '@'))) {
*domain++ = '\0';
for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) {
switch_hash_this(hi, NULL, NULL, &val);
profile = (vm_profile_t *) val;
total_new_messages = total_saved_messages = 0;
message_count(profile, id, domain, "inbox", &total_new_messages, &total_saved_messages,
&total_new_urgent_messages, &total_saved_urgent_messages);
if (total_new_messages || total_saved_messages) {
if (switch_event_create(&new_event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "yes");
switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", account);
switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)",
total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages);
switch_event_fire(&new_event);
sent++;
}
}
}
}
switch_safe_free(id);
}
if (!sent) {
if (switch_event_create(&new_event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "no");
switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", account);
switch_event_fire(&new_event);
}
}
}
SWITCH_MODULE_LOAD_FUNCTION(mod_voicemail_load) SWITCH_MODULE_LOAD_FUNCTION(mod_voicemail_load)
{ {
switch_application_interface_t *app_interface; switch_application_interface_t *app_interface;
@ -1514,6 +1732,13 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_voicemail_load)
*module_interface = switch_loadable_module_create_module_interface(pool, modname); *module_interface = switch_loadable_module_create_module_interface(pool, modname);
SWITCH_ADD_APP(app_interface, "voicemail", "Voicemail", VM_DESC, voicemail_function, VM_USAGE, SAF_NONE); SWITCH_ADD_APP(app_interface, "voicemail", "Voicemail", VM_DESC, voicemail_function, VM_USAGE, SAF_NONE);
if (switch_event_bind((char *) modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL)
!= SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
return SWITCH_STATUS_GENERR;
}
/* indicate that the module should continue to be loaded */ /* indicate that the module should continue to be loaded */
return SWITCH_STATUS_NOUNLOAD; return SWITCH_STATUS_NOUNLOAD;
} }

12
src/mod/endpoints/mod_sofia/sofia_presence.c
View File

@ -211,7 +211,14 @@ void sofia_presence_mwi_event_handler(switch_event_t *event)
for (hp = event->headers; hp; hp = hp->next) { for (hp = event->headers; hp; hp = hp->next) {
if (!strncasecmp(hp->name, "mwi-", 4)) { if (!strncasecmp(hp->name, "mwi-", 4)) {
stream.write_function(&stream, "%s: %s\r\n", hp->name + 4, hp->value); char *tmp = NULL;
char *value = hp->value;
if (!strcasecmp(hp->name, "mwi-message-account") && strncasecmp(hp->value, "sip:", 4)) {
tmp = switch_mprintf("sip:%s", hp->value);
value = tmp;
}
stream.write_function(&stream, "%s: %s\r\n", hp->name + 4, value);
switch_safe_free(tmp);
} }
} }
@ -223,7 +230,6 @@ void sofia_presence_mwi_event_handler(switch_event_t *event)
switch_safe_free(stream.data); switch_safe_free(stream.data);
assert (sql != NULL); assert (sql != NULL);
sofia_glue_execute_sql_callback(profile, sofia_glue_execute_sql_callback(profile,
SWITCH_FALSE, SWITCH_FALSE,
profile->ireg_mutex, profile->ireg_mutex,
@ -603,6 +609,8 @@ static int sofia_presence_mwi_callback(void *pArg, int argc, char **argv, char *
contact = sofia_glue_get_url_from_contact(tmp, 0); contact = sofia_glue_get_url_from_contact(tmp, 0);
nua_notify(nh, nua_notify(nh,
NUTAG_WITH_THIS(profile->nua),
NUTAG_NEWSUB(1),
NUTAG_URL(contact), NUTAG_URL(contact),
SIPTAG_TO_STR(full_from), SIPTAG_TO_STR(full_from),
SIPTAG_FROM_STR(id), SIPTAG_FROM_STR(id),

12
src/switch_ivr_play_say.c
View File

@ -156,8 +156,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *s
tts_engine = (char *) switch_xml_attr_soft(language, "tts_engine"); tts_engine = (char *) switch_xml_attr_soft(language, "tts_engine");
tts_voice = (char *) switch_xml_attr_soft(language, "tts_voice"); tts_voice = (char *) switch_xml_attr_soft(language, "tts_voice");
old_sound_prefix = switch_channel_get_variable(channel, "sound_prefix"); if (sound_path) {
switch_channel_set_variable(channel, "sound_prefix", sound_path); old_sound_prefix = switch_channel_get_variable(channel, "sound_prefix");
switch_channel_set_variable(channel, "sound_prefix", sound_path);
}
if (!(macro = switch_xml_child(language, "macro"))) { if (!(macro = switch_xml_child(language, "macro"))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "can't find any macro tags.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "can't find any macro tags.\n");
@ -269,9 +271,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *s
} }
done: done:
if (old_sound_prefix) {
switch_channel_set_variable(channel, "sound_prefix", old_sound_prefix); switch_channel_set_variable(channel, "sound_prefix", old_sound_prefix);
}
if (xml) { if (xml) {
switch_xml_free(xml); switch_xml_free(xml);
} }