June 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8757 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 19:15:57 2008 New Revision: 8757 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: avoiding deadlock (by not locking then locking again) Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Wed Jun 4 19:15:57 2008 @@ -1561,8 +1561,6 @@ "pa ringdev #<num>|<partial name>\n" "--------------------------------------------------------------------------------\n"; - switch_mutex_lock(globals.pa_mutex); - if (stream->param_event) { http = switch_event_get_header(stream->param_event, "http-host"); } @@ -1679,7 +1677,11 @@ if (http) { stream->write_function(stream, "<pre>"); } + + switch_mutex_lock(globals.pa_mutex); status = func(&argv[lead], argc - lead, stream); + switch_mutex_unlock(globals.pa_mutex); + if (http) { stream->write_function(stream, "\n\n</pre>"); } @@ -1726,8 +1728,6 @@ "<td><input name=action type=submit value=\"D\"></td></tr>\n" "</table>" "</form><br></center></td></tr></table>\n"); } - switch_mutex_lock(globals.pa_mutex); - switch_safe_free(mycmd); return status; }

1 0

[commit] r8756 - in freeswitch/trunk: conf src/mod/applications/mod_voicemail
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 18:52:37 2008 New Revision: 8756 Modified: freeswitch/trunk/conf/notify-voicemail.tpl freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: fix var names and add voicemail_notify_email template var Modified: freeswitch/trunk/conf/notify-voicemail.tpl ============================================================================== --- freeswitch/trunk/conf/notify-voicemail.tpl (original) +++ freeswitch/trunk/conf/notify-voicemail.tpl Wed Jun 4 18:52:37 2008 @@ -1,5 +1,5 @@ From: "${voicemail_caller_id_name}" <${voicemail_caller_id_number}@${voicemail_domain}> -To: <${voicemail_email}> +To: <${voicemail_notify_email}> Subject: Voicemail from "${voicemail_caller_id_name}" <${voicemail_caller_id_number}> ${voicemail_message_len} X-Priority: ${voicemail_priority} X-Mailer: FreeSWITCH 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 Wed Jun 4 18:52:37 2008 @@ -1288,7 +1288,7 @@ int total_new_urgent_messages = 0; int total_saved_urgent_messages = 0; int heard_auto_saved = 0, heard_auto_new = 0; - char *email_vm = NULL; + char *vm_email = NULL; char foo[2] = ""; switch_input_args_t args = { 0 }; @@ -1392,7 +1392,7 @@ 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)); - cbt.email = email_vm; + cbt.email = vm_email; switch (play_msg_type) { case MSG_NEW: { @@ -1661,7 +1661,7 @@ } else if (!strcasecmp(var, "vm-password")) { thepass = val; } else if (!strcasecmp(var, "vm-mailto")) { - email_vm = switch_core_session_strdup(session, val); + vm_email = switch_core_session_strdup(session, val); } } switch_xml_free(x_domain_root); @@ -1731,8 +1731,8 @@ switch_caller_profile_t *caller_profile = switch_channel_get_caller_profile(channel); switch_file_handle_t fh = { 0 }; switch_input_args_t args = { 0 }; - char *email_vm = NULL; - char *email_notify_vm = NULL; + char *vm_email = NULL; + char *vm_notify_email = NULL; int send_mail = 0; cc_t cc = { 0 }; char *read_flags = NORMAL_FLAG_STRING; @@ -1789,9 +1789,9 @@ const char *val = switch_xml_attr_soft(x_param, "value"); if (!strcasecmp(var, "vm-mailto")) { - email_vm = switch_core_session_strdup(session, val); + vm_email = switch_core_session_strdup(session, val); } else if (!strcasecmp(var, "vm-notify-mailto")) { - email_notify_vm = switch_core_session_strdup(session, val); + vm_notify_email = switch_core_session_strdup(session, val); } else if (!strcasecmp(var, "email-addr")) { email_addr = switch_core_session_strdup(session, val); } else if (!strcasecmp(var, "vm-email-all-messages")) { @@ -1806,17 +1806,17 @@ } } - if (send_main && switch_strlen_zero(email_vm) && !switch_strlen_zero(email_addr)) { - email_vm = switch_core_session_strdup(session, email_addr); - if (switch_strlen_zero(email_vm)) { + if (send_main && switch_strlen_zero(vm_email) && !switch_strlen_zero(email_addr)) { + vm_email = switch_core_session_strdup(session, email_addr); + if (switch_strlen_zero(vm_email)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No email address, not going to send email.\n"); send_main = 0; } } - if (send_notify && switch_strlen_zero(email_notify_vm)) { - email_notify_vm = email_vm; - if (switch_strlen_zero(email_notify_vm)) { + if (send_notify && switch_strlen_zero(vm_notify_email)) { + vm_notify_email = vm_email; + if (switch_strlen_zero(vm_notify_email)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No notify email address, not going to notify.\n"); send_notify = 0; } @@ -1986,7 +1986,7 @@ end: - if (send_mail && !switch_strlen_zero(email_vm) && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + if (send_mail && !switch_strlen_zero(vm_email) && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { switch_event_t *event; char *from; char *body; @@ -2026,8 +2026,12 @@ switch_channel_set_variable(channel, "voicemail_time", date); switch_snprintf(tmp, sizeof(tmp), "%d", priority); switch_channel_set_variable(channel, "voicemail_priority", tmp); - switch_channel_set_variable(channel, "voicemail_email", email_vm); - + if (vm_email) { + switch_channel_set_variable(channel, "voicemail_email", vm_email); + } + if (vm_notify_email) { + switch_channel_set_variable(channel, "voicemail_notify_email", vm_notify_email); + } l_duration = (long) message_len *1000000; switch_core_measure_time(l_duration, &duration); duration.day += duration.yr * 365; @@ -2077,12 +2081,12 @@ } if (email_attach) { - switch_simple_email(email_vm, from, header_string, body, file_path); + switch_simple_email(vm_email, from, header_string, body, file_path); } else { - switch_simple_email(email_vm, from, header_string, body, NULL); + switch_simple_email(vm_email, from, header_string, body, NULL); } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", email_vm); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", vm_email); switch_safe_free(body); if (headers != profile->email_headers) { @@ -2124,9 +2128,9 @@ body = switch_mprintf("%u second Voicemail from %s %s", message_len, caller_profile->caller_id_name, caller_profile->caller_id_number); } - switch_simple_email(email_notify_vm, from, header_string, body, NULL); + switch_simple_email(vm_notify_email, from, header_string, body, NULL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending notify message to %s\n", email_notify_vm); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending notify message to %s\n", vm_notify_email); switch_safe_free(body); if (headers != profile->notify_email_headers) {

1 0

[commit] r8755 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: stkn Date: Wed Jun 4 14:01:26 2008 New Revision: 8755 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Log: Only link libswift, other libs are dynamically loaded by the swift engine Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Wed Jun 4 14:01:26 2008 @@ -1,4 +1,4 @@ -LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-L$(SWIFT_HOME)/lib -L/opt/swift/lib -lswift -lceplex_us -lceplang_en -lm" ; fi ; +LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-L$(SWIFT_HOME)/lib -L/opt/swift/lib -lswift -lm" ; fi ; LOCAL_INSERT_CFLAGS=test $$osarch = "Darwin" || echo "-I$(SWIFT_HOME)/include -I/opt/swift/include"; LOCAL_CFLAGS=-w

1 0

[commit] r8754 - freeswitch/trunk/libs/apr/memory/unix
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 13:53:33 2008 New Revision: 8754 Modified: freeswitch/trunk/libs/apr/memory/unix/apr_pools.c Log: prevent endless loop Modified: freeswitch/trunk/libs/apr/memory/unix/apr_pools.c ============================================================================== --- freeswitch/trunk/libs/apr/memory/unix/apr_pools.c (original) +++ freeswitch/trunk/libs/apr/memory/unix/apr_pools.c Wed Jun 4 13:53:33 2008 @@ -1990,7 +1990,12 @@ } lastp = &c->next; - c = c->next; + + if (c == c->next) { + c = NULL; + } else { + c = c->next; + } } }

1 0

[commit] r8753 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 12:13:15 2008 New Revision: 8753 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: add per user acl 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 Wed Jun 4 12:13:15 2008 @@ -1060,7 +1060,7 @@ passwd = val; } - if (!strcasecmp(var, "auth_acl")) { + if (!strcasecmp(var, "auth-acl")) { auth_acl = val; } @@ -1079,7 +1079,7 @@ passwd = val; } - if (!strcasecmp(var, "auth_acl")) { + if (!strcasecmp(var, "auth-acl")) { auth_acl = val; }

1 0

[commit] r8752 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 12:11:09 2008 New Revision: 8752 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: add per user acl 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 Wed Jun 4 12:11:09 2008 @@ -785,6 +785,8 @@ if (ok && !(profile->pflags & PFLAG_BLIND_REG)) { type = REG_AUTO_REGISTER; } else if (!ok) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl %s\n", network_ip, profile->reg_acl[x]); + nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); goto end; } }

1 0

[commit] r8751 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 12:04:08 2008 New Revision: 8751 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: add per user acl 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 Wed Jun 4 12:04:08 2008 @@ -785,8 +785,6 @@ if (ok && !(profile->pflags & PFLAG_BLIND_REG)) { type = REG_AUTO_REGISTER; } else if (!ok) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl %s\n", network_ip, profile->reg_acl[x]); - nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); goto end; } } @@ -933,6 +931,7 @@ char hexdigest[2 * SU_MD5_DIGEST_SIZE + 1] = ""; char *domain_name = NULL; switch_event_t *params = NULL; + const char *auth_acl = NULL; username = realm = nonce = uri = qop = cnonce = nc = response = NULL; @@ -1037,7 +1036,7 @@ ret = AUTH_FORBIDDEN; goto end; } - + if (!(mailbox = (char *) switch_xml_attr(user, "mailbox"))) { mailbox = username; } @@ -1059,6 +1058,10 @@ passwd = val; } + if (!strcasecmp(var, "auth_acl")) { + auth_acl = val; + } + if (!strcasecmp(var, "a1-hash")) { a1_hash = val; } @@ -1074,12 +1077,24 @@ passwd = val; } + if (!strcasecmp(var, "auth_acl")) { + auth_acl = val; + } + if (!strcasecmp(var, "a1-hash")) { a1_hash = val; } } } + if (auth_acl) { + if (!switch_check_network_list_ip(ip, auth_acl)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by user acl %s\n", ip, auth_acl); + ret = AUTH_FORBIDDEN; + goto end; + } + } + if (switch_strlen_zero(passwd) && switch_strlen_zero(a1_hash)) { ret = AUTH_OK; goto skip_auth;

1 0

[commit] r8750 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 03 Jun '08

03 Jun '08

Author: anthm Date: Tue Jun 3 18:49:57 2008 New Revision: 8750 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: call the orkin man 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 Tue Jun 3 18:49:57 2008 @@ -220,8 +220,8 @@ { fifo_node_t *node, **node_list = (fifo_node_t **) user_data; int x = 0, total = 0, i = 0; - - for (i = 0;; i++) { + + for (i = 0 ;; i++) { if (!(node = node_list[i])) { break; } @@ -448,8 +448,9 @@ check_string(announce); check_string(moh); + switch_assert(node); - if (!consumer && node) { + if (!consumer) { switch_core_session_t *other_session; switch_channel_t *other_channel; const char *uuid = switch_core_session_get_uuid(session); @@ -740,11 +741,11 @@ pop = NULL; if (moh && do_wait) { - switch_status_t moh_status = switch_ivr_play_file(session, NULL, moh, &args); + switch_status_t moh_status; memset(&args, 0, sizeof(args)); args.read_frame_callback = consumer_read_frame_callback; args.user_data = node_list; - switch_ivr_play_file(session, NULL, moh, &args); + moh_status = switch_ivr_play_file(session, NULL, moh, &args); if (!SWITCH_READ_ACCEPTABLE(moh_status)) { break;

1 0

[commit] r8749 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 03 Jun '08

03 Jun '08

Author: anthm Date: Tue Jun 3 18:49:03 2008 New Revision: 8749 Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml Log: forgot to commit this Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml Tue Jun 3 18:49:03 2008 @@ -43,6 +43,7 @@ <param name="vmain-key" value="*"/> <email> <param name="template-file" value="voicemail.tpl"/> + <param name="notify-template-file" value="notify-voicemail.tpl"/>  <param name="date-fmt" value="%A, %B %d %Y, %I %M %p"/> <param name="email-from" value="${voicemail_account}@${voicemail_domain}"/>

1 0

[commit] r8748 - in freeswitch/trunk: conf src/mod/applications/mod_voicemail
by Freeswitch SVN 03 Jun '08

03 Jun '08

Author: anthm Date: Tue Jun 3 18:01:26 2008 New Revision: 8748 Added: freeswitch/trunk/conf/notify-voicemail.tpl Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: This feature was a patch we probably should have looked at closer? I reverted it and wrote a new one, please test as i am not able to atm this is a blind commit. vm-mailto (default undef) "the addr you want main email" vm-notify-mailto (default same as vm-mailto) "the addr you want notifications sent to" vm-email-all-messages (default false) "send all messages to vm-mailto addr (attachment based on vm-attach-file param)" vm-notify-email-all-messages (default false) "send a notify email to vm-notify-mailto when a vm is left (never has attachment)" vm-keep-local-after-email (default true) when you email the main message also keep it locally as new vm for the phone. when false means delete it as if it never happened and just email it. vm-attach-file (default true) attach the audio file to the main email the notify email will use the same template as the main email unless you define the new profile param "notify-template-file" Added: freeswitch/trunk/conf/notify-voicemail.tpl ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/notify-voicemail.tpl Tue Jun 3 18:01:26 2008 @@ -0,0 +1,42 @@ +From: "${voicemail_caller_id_name}" <${voicemail_caller_id_number}@${voicemail_domain}> +To: <${voicemail_email}> +Subject: Voicemail from "${voicemail_caller_id_name}" <${voicemail_caller_id_number}> ${voicemail_message_len} +X-Priority: ${voicemail_priority} +X-Mailer: FreeSWITCH + +Content-Type: multipart/alternative; + boundary="000XXX000" + +--000XXX000 +Content-Type: text/plain; charset=ISO-8859-1; Format=Flowed +Content-Disposition: inline +Content-Transfer-Encoding: 7bit + +Created: ${voicemail_time} +From: "${voicemail_caller_id_name}" <${voicemail_caller_id_number}> +Duration: ${voicemail_message_len} +Account: ${voicemail_account}@${voicemail_domain} + +--000XXX000 +Content-Type: text/html; charset=ISO-8859-1 +Content-Disposition: inline +Content-Transfer-Encoding: 7bit + +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<title>Voicemail from "${voicemail_caller_id_name}" <${voicemail_caller_id_number}> ${voicemail_message_len}</title> +<meta content="text/html; charset=iso-8859-1" http-equiv="content-type"/> +</head> +<body> + +<font face=arial> +<b>Message From "${voicemail_caller_id_name}" <A HREF="tel:${voicemail_caller_id_number}">${voicemail_caller_id_number}</A></b><br> +<hr noshade size=1> +Created: ${voicemail_time}<br> +Duration: ${voicemail_message_len}<br> +Account: ${voicemail_account}@${voicemail_domain}<br> + +</body> +</html> +--000XXX000-- 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 Tue Jun 3 18:01:26 2008 @@ -94,6 +94,8 @@ char *callback_context; char *email_body; char *email_headers; + char *notify_email_body; + char *notify_email_headers; char *web_head; char *web_tail; char *email_from; @@ -272,6 +274,8 @@ char *callback_context = "default"; char *email_body = NULL; char *email_headers = NULL; + char *notify_email_body = NULL; + char *notify_email_headers = NULL; char *email_from = ""; char *date_fmt = "%A, %B %d %Y, %I %M %p"; char *web_head = NULL; @@ -338,6 +342,36 @@ } } switch_safe_free(dpath); + } else if (!strcasecmp(var, "notify-template-file") && !switch_strlen_zero(val)) { + switch_stream_handle_t stream = { 0 }; + int fd; + char *dpath = NULL; + char *path; + + if (switch_is_file_path(val)) { + path = val; + } else { + dpath = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, val); + path = dpath; + } + + if ((fd = open(path, O_RDONLY)) > -1) { + char buf[2048]; + SWITCH_STANDARD_STREAM(stream); + while (switch_fd_read_line(fd, buf, sizeof(buf))) { + stream.write_function(&stream, "%s", buf); + } + close(fd); + notify_email_headers = stream.data; + if ((notify_email_body = strstr(notify_email_headers, "\n\n"))) { + *notify_email_body = '\0'; + notify_email_body += 2; + } else if ((notify_email_body = strstr(notify_email_headers, "\r\n\r\n"))) { + *notify_email_body = '\0'; + notify_email_body += 4; + } + } + switch_safe_free(dpath); } } } @@ -614,6 +648,13 @@ profile->email_body = email_body; profile->email_headers = email_headers; + if (notify_email_headers) { + profile->notify_email_body = notify_email_body; + profile->notify_email_headers = notify_email_headers; + } else { + profile->notify_email_body = email_body; + profile->notify_email_headers = email_headers; + } profile->email_from = switch_core_strdup(globals.pool, email_from); profile->date_fmt = switch_core_strdup(globals.pool, date_fmt); @@ -1676,7 +1717,6 @@ } } - static switch_status_t voicemail_leave_main(switch_core_session_t *session, const char *profile_name, const char *domain_name, const char *id) { switch_channel_t *channel = switch_core_session_get_channel(session); @@ -1692,14 +1732,12 @@ switch_file_handle_t fh = { 0 }; switch_input_args_t args = { 0 }; char *email_vm = NULL; - char *email_vm_notify = NULL; + char *email_notify_vm = NULL; int send_mail = 0; - int send_mail_only = 0; cc_t cc = { 0 }; char *read_flags = NORMAL_FLAG_STRING; int priority = 3; int email_attach = 1; - int email_delete = 1; char buf[2]; char *greet_path = NULL; const char *voicemail_greeting_number = NULL; @@ -1709,6 +1747,9 @@ switch_size_t retsize; switch_time_t ts = switch_timestamp_now(); char *dbuf = NULL; + int send_main = 0; + int send_notify = 0; + int insert_db = 1; memset(&cbt, 0, sizeof(cbt)); if (!(profile = switch_core_hash_find(globals.profile_hash, profile_name))) { @@ -1749,26 +1790,48 @@ if (!strcasecmp(var, "vm-mailto")) { email_vm = switch_core_session_strdup(session, val); - } else if (!strcasecmp(var, "vm-mailto-notify")) { - email_vm_notify = switch_core_session_strdup(session, val); + } else if (!strcasecmp(var, "vm-notify-mailto")) { + email_notify_vm = switch_core_session_strdup(session, val); } else if (!strcasecmp(var, "email-addr")) { - email_addr = val; - } else if (!strcasecmp(var, "vm-email-only")) { - send_mail_only = switch_true(val); + email_addr = switch_core_session_strdup(session, val); } else if (!strcasecmp(var, "vm-email-all-messages")) { - send_mail = switch_true(val); - } else if (!strcasecmp(var, "vm-delete-file")) { - email_delete = switch_true(val); + send_main = send_mail = switch_true(val); + } else if (!strcasecmp(var, "vm-notify-email-all-messages")) { + send_notify = send_mail = switch_true(val); + } else if (!strcasecmp(var, "vm-keep-local-after-email")) { + insert_db = switch_true(val); } else if (!strcasecmp(var, "vm-attach-file")) { email_attach = switch_true(val); } } } - if (send_mail && switch_strlen_zero(email_vm) && !switch_strlen_zero(email_addr)) { + if (send_main && switch_strlen_zero(email_vm) && !switch_strlen_zero(email_addr)) { email_vm = switch_core_session_strdup(session, email_addr); + if (switch_strlen_zero(email_vm)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No email address, not going to send email.\n"); + send_main = 0; + } } + if (send_notify && switch_strlen_zero(email_notify_vm)) { + email_notify_vm = email_vm; + if (switch_strlen_zero(email_notify_vm)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No notify email address, not going to notify.\n"); + send_notify = 0; + } + } + + if (send_mail && (!(send_main || send_notify))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Falling back to leaving message locally due to too many misconfigurations.\n"); + send_mail = 0; + insert_db = 1; + } + + if (send_notify && !send_main) { + insert_db = 1; + } + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", id, domain_name); ok = 0; @@ -1888,7 +1951,7 @@ } } - if (!send_mail_only && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + if (insert_db && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { char *usql; switch_event_t *event; char *mwi_id = NULL; @@ -1979,50 +2042,99 @@ from = switch_channel_expand_variables(channel, profile->email_headers); } - if (switch_strlen_zero(profile->email_headers)) { - headers = switch_core_session_sprintf(session, - "From: FreeSWITCH mod_voicemail <%s@%s>\n" - "Subject: Voicemail from %s %s\nX-Priority: %d", - id, domain_name, caller_profile->caller_id_name, caller_profile->caller_id_number, priority); - } else { - headers = switch_channel_expand_variables(channel, profile->email_headers); - } + + if (send_main) { + if (switch_strlen_zero(profile->email_headers)) { + headers = switch_mprintf( + "From: FreeSWITCH mod_voicemail <%s@%s>\n" + "Subject: Voicemail from %s %s\nX-Priority: %d", + id, domain_name, caller_profile->caller_id_name, caller_profile->caller_id_number, priority); + } else { + headers = switch_channel_expand_variables(channel, profile->email_headers); + } - p = headers + (strlen(headers) - 1); + p = headers + (strlen(headers) - 1); + + if (*p == '\n') { + if (*(p - 1) == '\r') { + p--; + } + *p = '\0'; + } + + header_string = switch_core_session_sprintf(session, "%s\nX-Voicemail-Length: %u", headers, message_len); + + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(channel, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Type", "voicemail"); + switch_event_fire(&event); + } + + if (profile->email_body) { + body = switch_channel_expand_variables(channel, profile->email_body); + } else { + body = switch_mprintf("%u second Voicemail from %s %s", message_len, caller_profile->caller_id_name, caller_profile->caller_id_number); + } - if (*p == '\n') { - if (*(p - 1) == '\r') { - p--; + if (email_attach) { + switch_simple_email(email_vm, from, header_string, body, file_path); + } else { + switch_simple_email(email_vm, from, header_string, body, NULL); } - *p = '\0'; - } - header_string = switch_core_session_sprintf(session, "%s\nX-Voicemail-Length: %u", headers, message_len); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", email_vm); + switch_safe_free(body); - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Type", "voicemail"); - switch_event_fire(&event); + if (headers != profile->email_headers) { + switch_safe_free(headers); + } } - if (profile->email_body) { - body = switch_channel_expand_variables(channel, profile->email_body); - } else { - body = switch_mprintf("%u second Voicemail from %s %s", message_len, caller_profile->caller_id_name, caller_profile->caller_id_number); - } - if (email_attach) { - switch_simple_email(email_vm, from, header_string, body, file_path); - } else { - switch_simple_email(email_vm, from, header_string, body, NULL); - } - if (!switch_strlen_zero(email_vm_notify)) { - switch_simple_email(email_vm_notify, from, header_string, body, NULL); + if (send_notify) { + if (switch_strlen_zero(profile->notify_email_headers)) { + headers = switch_mprintf( + "From: FreeSWITCH mod_voicemail <%s@%s>\n" + "Subject: Voicemail from %s %s\nX-Priority: %d", + id, domain_name, caller_profile->caller_id_name, caller_profile->caller_id_number, priority); + } else { + headers = switch_channel_expand_variables(channel, profile->notify_email_headers); + } + + p = headers + (strlen(headers) - 1); + + if (*p == '\n') { + if (*(p - 1) == '\r') { + p--; + } + *p = '\0'; + } + + header_string = switch_core_session_sprintf(session, "%s\nX-Voicemail-Length: %u", headers, message_len); + + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(channel, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Type", "voicemail-notify"); + switch_event_fire(&event); + } + + if (profile->notify_email_body) { + body = switch_channel_expand_variables(channel, profile->notify_email_body); + } else { + body = switch_mprintf("%u second Voicemail from %s %s", message_len, caller_profile->caller_id_name, caller_profile->caller_id_number); + } + + switch_simple_email(email_notify_vm, from, header_string, body, NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending notify message to %s\n", email_notify_vm); + switch_safe_free(body); + + if (headers != profile->notify_email_headers) { + switch_safe_free(headers); + } } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", email_vm); - switch_safe_free(body); - if (email_delete && send_mail_only) { + if (!insert_db) { if (unlink(file_path) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to delete file [%s]\n", file_path); }

1 0