- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6038 - freeswitch/trunk/src
by Freeswitch SVN 23 Oct '07

23 Oct '07

Author: anthm Date: Tue Oct 23 17:56:31 2007 New Revision: 6038 Modified: freeswitch/trunk/src/switch_event.c Log: fix stupidness Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Oct 23 17:56:31 2007 @@ -545,7 +545,7 @@ switch_event_header_t *hp, *lp = NULL; switch_status_t status = SWITCH_STATUS_FALSE; - for (hp = event->headers; hp && hp->next; hp = hp->next) { + for (hp = event->headers; hp; hp = hp->next) { if (!strcmp(header_name, hp->name)) { if (lp) { lp->next = hp->next;

1 0

[commit] r6037 - in freeswitch/trunk/src: . include
by Freeswitch SVN 23 Oct '07

23 Oct '07

Author: anthm Date: Tue Oct 23 17:32:17 2007 New Revision: 6037 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_rtp.c Log: fix MODAPP-3 Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Oct 23 17:32:17 2007 @@ -632,6 +632,7 @@ SFF_RAW_RTP = (1 << 1) - Frame has raw rtp accessible SFF_RTP_HEADER = (1 << 2) - Get the rtp header from the frame header SFF_PLC = (1 << 3) - Frame has generated PLC data +SFF_RFC2833 = (1 << 4) - Frame has rfc2833 dtmf data </pre> */ typedef enum { @@ -639,7 +640,8 @@ SFF_CNG = (1 << 0), SFF_RAW_RTP = (1 << 1), SFF_RTP_HEADER = (1 << 2), - SFF_PLC = (1 << 3) + SFF_PLC = (1 << 3), + SFF_RFC2833 = (1 << 4) } switch_frame_flag_t; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Oct 23 17:32:17 2007 @@ -1219,6 +1219,9 @@ frame->packetlen = bytes; frame->source = __FILE__; frame->flags |= SFF_RAW_RTP; + if (frame->payload == rtp_session->te) { + frame->flags |= SFF_RFC2833; + } frame->timestamp = ntohl(rtp_session->recv_msg.header.ts); frame->seq = (uint16_t)ntohs((u_short)rtp_session->recv_msg.header.seq); frame->ssrc = ntohl(rtp_session->recv_msg.header.ssrc); @@ -1282,8 +1285,15 @@ if (fwd) { bytes = datalen; send_msg = (rtp_msg_t *) data; + if (*flags & SFF_RFC2833) { + send_msg->header.pt = rtp_session->te; + } } else { uint8_t m = 0; + + if (*flags & SFF_RFC2833) { + payload = rtp_session->te; + } if ((rtp_session->ts > (rtp_session->last_write_ts + (rtp_session->samples_per_interval * 10))) || rtp_session->ts == rtp_session->samples_per_interval) {

1 0

[commit] r6036 - freeswitch/trunk/src
by Freeswitch SVN 23 Oct '07

23 Oct '07

Author: anthm Date: Tue Oct 23 15:32:36 2007 New Revision: 6036 Modified: freeswitch/trunk/src/switch_xml.c Log: fix FSCORE-55 Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Oct 23 15:32:36 2007 @@ -956,9 +956,12 @@ *p = '\0'; } } else { - dir_path = SWITCH_GLOBAL_dirs.conf_dir; p = switch_core_sprintf(pool, "%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, pattern); pattern = p; + dir_path = switch_core_strdup(pool, pattern); + if ((p = strrchr(dir_path, *SWITCH_PATH_SEPARATOR))) { + *p = '\0'; + } } switch_match_glob(pattern, &result, pool); @@ -967,7 +970,6 @@ for (i = 0; i < result->nelts; i++) { char *path = list[i]; - if (strcmp(path, ".") && strcmp(path, "..")) { p = switch_core_sprintf(pool, "%s%s%s", dir_path, SWITCH_PATH_SEPARATOR, path); if (preprocess(p, write_fd, rlevel) < 0) {

1 0

[commit] r6035 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 23 Oct '07

23 Oct '07

Author: anthm Date: Tue Oct 23 15:02:47 2007 New Revision: 6035 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix MODLANG-42 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Oct 23 15:02:47 2007 @@ -2908,7 +2908,7 @@ { char *code; if (argc > 0 && (code = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) { - if (eval_some_js(code, cx, obj, rval) < 0) { + if (eval_some_js(code, cx, obj, rval) <= 0) { return JS_FALSE; } return JS_TRUE;

1 0

[commit] r6034 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 23 Oct '07

23 Oct '07

Author: anthm Date: Tue Oct 23 14:25:58 2007 New Revision: 6034 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix MODLANG-43 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Oct 23 14:25:58 2007 @@ -1097,14 +1097,14 @@ } return SWITCH_STATUS_SUCCESS; } else if (!strcasecmp(ret, "restart")) { - unsigned int pos = 0; + uint32_t pos = 0; fh->speed = 0; switch_core_file_seek(fh, &pos, 0, SEEK_SET); return SWITCH_STATUS_SUCCESS; } else if (!strncasecmp(ret, "seek", 4)) { switch_codec_t *codec; - unsigned int samps = 0; - unsigned int pos = 0; + uint32_t samps = 0; + uint32_t pos = 0; char *p; codec = switch_core_session_get_read_codec(jss->session); @@ -1119,7 +1119,7 @@ samps = step * (codec->implementation->actual_samples_per_second / 1000); switch_core_file_seek(fh, &pos, samps, SEEK_CUR); } else { - samps = step * (codec->implementation->actual_samples_per_second / 1000); + samps = abs(step) * (codec->implementation->actual_samples_per_second / 1000); switch_core_file_seek(fh, &pos, fh->pos - samps, SEEK_SET); } } else {

1 0

[commit] r6033 - in freeswitch/trunk: . src src/include src/include/private
by Freeswitch SVN 23 Oct '07

23 Oct '07

Author: mikej Date: Tue Oct 23 11:56:23 2007 New Revision: 6033 Modified: freeswitch/trunk/configure.in freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_core.c Log: add -u and -g command line args to set user and group. properly handle portability for mlockall and setrlimit Tested on linux, Freebsd, solaris, mac. FSCORE-47 Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Tue Oct 23 11:56:23 2007 @@ -170,7 +170,7 @@ # Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC -AC_CHECK_HEADERS([sys/types.h]) +AC_CHECK_HEADERS([sys/types.h sys/resource.h sched.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -185,6 +185,59 @@ AC_TYPE_SIGNAL AC_FUNC_STRFTIME AC_CHECK_FUNCS([gethostname vasprintf mmap mlock mlockall usleep]) +AC_CHECK_FUNCS([sched_setscheduler setpriority setrlimit setgroups initgroups]) + +AC_CHECK_DECL([RLIMIT_MEMLOCK], + [AC_DEFINE([HAVE_RLIMIT_MEMLOCK],[1],[RLIMIT_MEMLOCK constant for setrlimit])],, + [#ifdef HAVE_SYS_RESOURCE_H + #include <sys/resource.h> + #endif]) + +AC_CHECK_DECL([SCHED_RR], + [AC_DEFINE([HAVE_SCHED_RR],[1],[SCHED_RR constant for sched_setscheduler])],, + [#ifdef HAVE_SCHED_H + #include <sched.h> + #endif]) + +# +# use mlockall only on linux (for now; if available) +# +if test "x${ac_cv_func_mlockall}" = "xyes"; then + AC_MSG_CHECKING([whether to use mlockall]) + case "$host" in + *-linux-*) + AC_DEFINE([USE_MLOCKALL],[1],[Enable mlockall support]) + AC_MSG_RESULT([yes]) + USE_MLOCKALL=yes + ;; + *-freebsd*) + AC_MSG_RESULT([no, broken for non-root users]) + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac + + # + # setrlimit prerequisites + # + if test "x${USE_MLOCKALL}" = "xyes" -a \ + "x${ac_cv_func_setrlimit}" = "xyes" -a \ + "x${ac_cv_have_decl_RLIMIT_MEMLOCK}" = "xyes" + then + AC_DEFINE([USE_SETRLIMIT],[1],[Use setrlimit to disable mlock limit for non-root users]) + fi +fi + +# +# sched_setcheduler + round-robin scheduler prerequisites +# +if test "x${ac_cv_func_sched_setscheduler}" = "xyes" -a \ + "x${ac_cv_have_decl_SCHED_RR}" = "xyes" +then + AC_DEFINE([USE_SCHED_SETSCHEDULER],[1],[Enable round-robin scheduler using sched_setscheduler]) +fi + AC_C_BIGENDIAN(AC_DEFINE([SWITCH_BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([SWITCH_BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian])) Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Tue Oct 23 11:56:23 2007 @@ -60,6 +60,19 @@ #include <sys/mman.h> #endif +#ifndef WIN32 +/* setuid, setgid */ +#include <unistd.h> + +/* getgrnam, getpwnam */ +#include <pwd.h> +#include <grp.h> + +#ifdef HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif +#endif + /* #define DEBUG_ALLOC */ #define DO_EVENTS Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Oct 23 11:56:23 2007 @@ -1414,6 +1414,18 @@ SWITCH_DECLARE(int32_t) set_high_priority(void); /*! + \brief Change user and/or group of the running process + \long Several possible combinations: + - user only (group NULL): switch to user and his primary group (and supplementary groups, if supported) + - user and group: switch to user and specified group (only) + - group only (user NULL): switch group only + \param user name of the user to switch to (or NULL) + \param group name of the group to switch to (or NULL) + \return 0 on success, -1 otherwise +*/ +SWITCH_DECLARE(int32_t) change_user_group(const char *user, const char *group); + +/*! \brief Run endlessly until the system is shutdown \param bg divert console to the background */ Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Tue Oct 23 11:56:23 2007 @@ -205,6 +205,8 @@ const char *err = NULL; /* error value for return from freeswitch initialization */ #ifndef WIN32 int nf = 0; /* TRUE if we are running in nofork mode */ + char *runas_user = NULL; + char *runas_group = NULL; #endif int nc = 0; /* TRUE if we are running in noconsole mode */ FILE *f; /* file handle to the pid file */ @@ -214,6 +216,7 @@ char *usageDesc; int alt_dirs = 0; int known_opt; + int high_prio = 0; switch_core_flag_t flags = SCF_USE_SQL; #ifdef WIN32 @@ -229,6 +232,8 @@ "\t-uninstall -- remove freeswitch as a service\n" #else "\t-nf -- no forking\n" + "\t-u [user] -- specify user to switch to\n" + "\t-g [group] -- specify group to switch to\n" #endif "\t-help -- this message\n" "\t-hp -- enable high priority settings\n" @@ -280,6 +285,21 @@ } } #else + if (argv[x] && !strcmp(argv[x], "-u")) { + x++; + if (argv[x] && strlen(argv[x])) { + runas_user = argv[x]; + } + known_opt++; + } + + if (argv[x] && !strcmp(argv[x], "-g")) { + x++; + if (argv[x] && strlen(argv[x])) { + runas_group = argv[x]; + } + known_opt++; + } if (argv[x] && !strcmp(argv[x], "-nf")) { nf++; @@ -287,7 +307,7 @@ } #endif if (argv[x] && !strcmp(argv[x], "-hp")) { - set_high_priority(); + high_prio++; known_opt++; } @@ -389,6 +409,19 @@ #endif } + if (high_prio) { + set_high_priority(); + } + +#ifndef WIN32 + if (runas_user || runas_group) { + if(change_user_group(runas_user, runas_group) < 0) { + fprintf(stderr, "Failed to switch user / group\n" ); + return 255; + } + } +#endif + if (switch_core_init_and_modload(nc ? lfile : NULL, flags, &err) != SWITCH_STATUS_SUCCESS) { fprintf(stderr, "Cannot Initilize [%s]\n", err); return 255; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Oct 23 11:56:23 2007 @@ -360,7 +360,19 @@ SWITCH_DECLARE(int32_t) set_high_priority(void) { -#ifdef __linux__ +#ifdef WIN32 + SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS); +#else + +#ifdef USE_SETRLIMIT + struct rlimit lim = { RLIM_INFINITY, RLIM_INFINITY }; +#endif + +#ifdef USE_SCHED_SETSCHEDULER + /* + * Try to use a round-robin scheduler + * with a fallback if that does not work + */ struct sched_param sched = { 0 }; sched.sched_priority = 1; if (sched_setscheduler(0, SCHED_RR, &sched)) { @@ -371,19 +383,126 @@ } #endif -#ifdef WIN32 - SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS); +#ifdef HAVE_SETPRIORITY + /* + * setpriority() works on FreeBSD (6.2), nice() doesn't + */ + if (setpriority(PRIO_PROCESS, getpid(), -10) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not set nice level\n"); + } #else - if(nice(-10)!= -10) { + if (nice(-10) != -10) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not set nice level\n"); } #endif -#define USE_MLOCKALL -#ifdef HAVE_MLOCKALL +#ifdef USE_SETRLIMIT + /* + * The amount of memory which can be mlocked is limited for non-root users. + * FS will segfault (= hitting the limit) soon after mlockall has been called + * and we've switched to a different user. + * So let's try to remove the mlock limit here... + */ + if (setrlimit(RLIMIT_MEMLOCK, &lim) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, + "Failed to disable memlock limit, application may crash if run as non-root user!\n"); + } +#endif + #ifdef USE_MLOCKALL + /* + * Pin memory pages to RAM to prevent being swapped to disk + */ mlockall(MCL_CURRENT | MCL_FUTURE); #endif + +#endif + return 0; +} + +SWITCH_DECLARE(int32_t) change_user_group(const char *user, const char *group) +{ +#ifndef WIN32 + uid_t runas_uid = 0; + gid_t runas_gid = 0; + struct passwd *runas_pw = NULL; + + if (user) { + /* + * Lookup user information in the system's db + */ + runas_pw = getpwnam( user ); + if (!runas_pw) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unknown user \"%s\"\n", user); + return -1; + } + runas_uid = runas_pw->pw_uid; + } + + if (group) { + struct group *gr = NULL; + + /* + * Lookup group information in the system's db + */ + gr = getgrnam( group ); + if (!gr) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unknown group \"%s\"\n", group); + return -1; + } + runas_gid = gr->gr_gid; + } + + if (runas_uid) { +#ifdef HAVE_SETGROUPS + /* + * Drop all group memberships prior to changing anything + * or else we're going to inherit the parent's list of groups + * (which is not what we want...) + */ + if (setgroups(0, NULL) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to drop group access list\n"); + return -1; + } +#endif + if (runas_gid) { + /* + * A group has been passed, switch to it + * (without loading the user's other groups) + */ + if (setgid(runas_gid) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to change gid!\n"); + return -1; + } + } else { + /* + * No group has been passed, use the user's primary group in this case + */ + if (setgid(runas_pw->pw_gid) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to change gid!\n"); + return -1; + } + +#ifdef HAVE_INITGROUPS + /* + * Set all the other groups the user is a member of + * (This can be really useful for fine-grained access control) + */ + if (initgroups(runas_pw->pw_name, runas_pw->pw_gid) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to set group access list for user\n"); + return -1; + } +#endif + } + + /* + * Finally drop all privileges by switching to the new userid + */ + if (setuid(runas_uid) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to change uid!\n"); + return -1; + } + } #endif return 0; }

1 0

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

23 Oct '07

Author: anthm Date: Tue Oct 23 11:44:04 2007 New Revision: 6032 Modified: freeswitch/trunk/conf/voicemail_en_tts.xml freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: press main menu key during greeting to go to the check messages dialog Modified: freeswitch/trunk/conf/voicemail_en_tts.xml ============================================================================== --- freeswitch/trunk/conf/voicemail_en_tts.xml (original) +++ freeswitch/trunk/conf/voicemail_en_tts.xml Tue Oct 23 11:44:04 2007 @@ -207,7 +207,7 @@ <macro name="voicemail_say_date"> <input pattern="^(.*)$"> <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> </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 Tue Oct 23 11:44:04 2007 @@ -684,7 +684,7 @@ memset(buf, 0, buflen); args.input_callback = cancel_on_dtmf; args.buf = buf; - args.buflen = sizeof(buf); + args.buflen = buflen; ap = &args; } @@ -1543,7 +1543,7 @@ int priority = 3; int email_attach = 1; int email_delete = 1; - + char buf[2]; memset(&cbt, 0, sizeof(cbt)); if (!(profile = switch_core_hash_find(globals.profile_hash, profile_name))) { @@ -1582,7 +1582,7 @@ char *xtra = switch_mprintf("mailbox=%s", id); switch_xml_t x_domain, x_domain_root, x_user, x_params, x_param; const char *email_addr = NULL; - + assert(xtra); x_user = x_domain = x_domain_root = NULL; if (switch_xml_locate_user(id, domain_name, switch_channel_get_variable(channel, "network_addr"), @@ -1631,6 +1631,33 @@ file_path = switch_mprintf("%s%smsg_%s.%s", dir_path, SWITCH_PATH_SEPARATOR, uuid, profile->file_ext); + greet: + + args.input_callback = cancel_on_dtmf; + args.buf = buf; + args.buflen = sizeof(buf); + + if (!switch_strlen_zero(cbt.greeting_path)) { + memset(buf, 0, sizeof(buf)); + TRY_CODE(switch_ivr_play_file(session, NULL, cbt.greeting_path, &args)); + } else { + if (!switch_strlen_zero(cbt.name_path)) { + memset(buf, 0, sizeof(buf)); + TRY_CODE(switch_ivr_play_file(session, NULL, cbt.name_path, &args)); + } + if (switch_strlen_zero(buf)) { + memset(buf, 0, sizeof(buf)); + TRY_CODE(switch_ivr_phrase_macro(session, VM_PLAY_GREETING_MACRO, id, NULL, &args)); + } + } + + if (!strcasecmp(buf, profile->main_menu_key)) { + voicemail_check_main(session, profile_name, domain_name, id, 0); + } else { + goto greet; + } + + memset(&fh, 0, sizeof(fh)); args.input_callback = control_playback; memset(&cc, 0, sizeof(cc)); @@ -1639,14 +1666,6 @@ cc.noexit = 1; args.buf = &cc; - if (!switch_strlen_zero(cbt.greeting_path)) { - TRY_CODE(switch_ivr_play_file(session, NULL, cbt.greeting_path, NULL)); - } else { - if (!switch_strlen_zero(cbt.name_path)) { - TRY_CODE(switch_ivr_play_file(session, NULL, cbt.name_path, NULL)); - } - TRY_CODE(switch_ivr_phrase_macro(session, VM_PLAY_GREETING_MACRO, id, NULL, NULL)); - } status = create_file(session, profile, VM_RECORD_MESSAGE_MACRO, file_path); @@ -1667,11 +1686,7 @@ } } - /* TRX a race condition exists where you hang up right as you start to record, the recording subsystem detects there isnt - * a channel and refuses to create the file, as a result you get DB entries and MWI entries when there is no voicemail saved - * message counts and other things get out of sync - */ - if(!send_mail && switch_file_exists(file_path,switch_core_session_get_pool(session))==SWITCH_STATUS_SUCCESS) { + if(!send_mail && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { char *usql; switch_event_t *event; char *mwi_id = NULL; @@ -1816,11 +1831,6 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); - /* TRX this may not be required, every place that a directory is used above, a switch_dir_make_recursive() is called - * making this unneeded - the others are required since it involves making a directory for the user account, which - * may not exist until that first call, this however appears to be optional and while its 1 call at load time doesnt - * appear to do much - */ if (switch_dir_make_recursive(SWITCH_GLOBAL_dirs.storage_dir, DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s", SWITCH_GLOBAL_dirs.storage_dir); return;

1 0

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

23 Oct '07

Author: anthm Date: Tue Oct 23 11:09:29 2007 New Revision: 6031 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: formatting 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 Oct 23 11:09:29 2007 @@ -145,10 +145,10 @@ static switch_bool_t vm_execute_sql_callback(vm_profile_t *profile, - switch_mutex_t *mutex, - char *sql, - switch_core_db_callback_func_t callback, - void *pdata) + switch_mutex_t *mutex, + char *sql, + switch_core_db_callback_func_t callback, + void *pdata) { switch_bool_t ret = SWITCH_FALSE; switch_core_db_t *db; @@ -1648,56 +1648,56 @@ TRY_CODE(switch_ivr_phrase_macro(session, VM_PLAY_GREETING_MACRO, id, NULL, NULL)); } - 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) && switch_channel_ready(channel)) { - char input[10] = "", key_buf[80] = "", term = 0; + if ((status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK) && switch_channel_ready(channel)) { + char input[10] = "", key_buf[80] = "", term = 0; - snprintf(key_buf, sizeof(key_buf), "%s:%s", - profile->urgent_key, - profile->terminator_key); - - vm_macro_get(session, VM_RECORD_URGENT_CHECK_MACRO, key_buf, input, sizeof(input), 1, "", &term, profile->digit_timeout); - 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)); - } + snprintf(key_buf, sizeof(key_buf), "%s:%s", + profile->urgent_key, + profile->terminator_key); + + vm_macro_get(session, VM_RECORD_URGENT_CHECK_MACRO, key_buf, input, sizeof(input), 1, "", &term, profile->digit_timeout); + 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)); } + } - /* TRX a race condition exists where you hang up right as you start to record, the recording subsystem detects there isnt - * a channel and refuses to create the file, as a result you get DB entries and MWI entries when there is no voicemail saved - * message counts and other things get out of sync - */ - if(!send_mail && switch_file_exists(file_path,switch_core_session_get_pool(session))==SWITCH_STATUS_SUCCESS) { - 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; + /* TRX a race condition exists where you hang up right as you start to record, the recording subsystem detects there isnt + * a channel and refuses to create the file, as a result you get DB entries and MWI entries when there is no voicemail saved + * message counts and other things get out of sync + */ + if(!send_mail && switch_file_exists(file_path,switch_core_session_get_pool(session))==SWITCH_STATUS_SUCCESS) { + 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); - } - } + 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:

1 0

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

23 Oct '07

Author: anthm Date: Tue Oct 23 11:07:14 2007 New Revision: 6030 Modified: freeswitch/trunk/conf/directory.xml freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: merge MODAPP-40 Modified: freeswitch/trunk/conf/directory.xml ============================================================================== --- freeswitch/trunk/conf/directory.xml (original) +++ freeswitch/trunk/conf/directory.xml Tue Oct 23 11:07:14 2007 @@ -39,6 +39,9 @@  <param name="password" value="1234"/> <param name="vm-password" value="1234"/> +  +  +     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 Oct 23 11:07:14 2007 @@ -1062,7 +1062,6 @@ body = switch_channel_expand_variables(channel,profile->email_body); } - //TBD add better formatting to the body -- TRX done :) switch_simple_email(cbt->email, from, headers, body, cbt->file_path); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", cbt->email); switch_safe_free(body); @@ -1105,6 +1104,7 @@ int total_saved_urgent_messages = 0; int heard_auto_saved = 0, heard_auto_new = 0; char *email_vm = NULL; + channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -1488,7 +1488,6 @@ vm_check_state = VM_CHECK_FOLDER_SUMMARY; - //vm_check_state = VM_CHECK_MENU; } else { goto failed; } @@ -1542,6 +1541,9 @@ cc_t cc = { 0 }; char *read_flags = NORMAL_FLAG_STRING; int priority = 3; + int email_attach = 1; + int email_delete = 1; + memset(&cbt, 0, sizeof(cbt)); if (!(profile = switch_core_hash_find(globals.profile_hash, profile_name))) { @@ -1579,6 +1581,7 @@ int ok = 1; char *xtra = switch_mprintf("mailbox=%s", id); switch_xml_t x_domain, x_domain_root, x_user, x_params, x_param; + const char *email_addr = NULL; assert(xtra); x_user = x_domain = x_domain_root = NULL; @@ -1591,12 +1594,22 @@ if (!strcasecmp(var, "vm-mailto")) { email_vm = switch_core_session_strdup(session, val); + } else if (!strcasecmp(var, "email-addr")) { + email_addr = 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); + } 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)) { + email_vm = switch_core_session_strdup(session, email_addr); + } + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", id, domain_name); ok = 0; @@ -1760,11 +1773,17 @@ body = switch_channel_expand_variables(channel,profile->email_body); } - //TBD add better formatting to the body -- TRX done :) - switch_simple_email(email_vm, from, headers, body, file_path); + if(email_attach) { + switch_simple_email(email_vm, from, headers, body, file_path); + } else { + switch_simple_email(email_vm, from, headers, body, NULL); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", email_vm); switch_safe_free(body); - unlink(file_path); + if(email_delete) { + unlink(file_path); + } } switch_safe_free(file_path);

1 0

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

23 Oct '07

Author: anthm Date: Tue Oct 23 10:45:22 2007 New Revision: 6029 Modified: freeswitch/trunk/conf/voicemail.conf.xml freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: merge MODAPP-38 Modified: freeswitch/trunk/conf/voicemail.conf.xml ============================================================================== --- freeswitch/trunk/conf/voicemail.conf.xml (original) +++ freeswitch/trunk/conf/voicemail.conf.xml Tue Oct 23 10:45:22 2007 @@ -29,6 +29,20 @@ <param name="restart-key" value="1"/> <param name="ff-key" value="6"/> <param name="rew-key" value="4"/> + <email> + <body><![CDATA[At ${voicemail_time} you were left a message from ${voicemail_caller_id_name} ${voicemail_caller_id_number} +to your account ${voicemail_account}@${voicemail_domain} +]]></body> + <headers><![CDATA[From: FreeSWITCH mod_voicemail <${voicemail_account}@${voicemail_domain}> +To: <${voicemail_email}> +Subject: Voicemail from ${voicemail_caller_id_name} ${voicemail_caller_id_number} +X-Priority: ${voicemail_priority} +X-Mailer: FreeSWITCH +]]></headers> +  + <param name="date-fmt" value="%A, %B %d %Y, %I %M %p"/> + <param name="email-from" value="${voicemail_account}@${voicemail_domain}"/> + </email>   </profile> 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 Oct 23 10:45:22 2007 @@ -24,7 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> - * + * Bret McDanel <trixter AT 0xdecafbad.com> * * mod_voicemail.c -- Voicemail Module * @@ -83,6 +83,10 @@ char *storage_dir; char *callback_dialplan; char *callback_context; + char *email_body; + char *email_headers; + char *email_from; + char *date_fmt; uint32_t digit_timeout; uint32_t max_login_attempts; uint32_t max_record_len; @@ -229,7 +233,7 @@ { char *cf = "voicemail.conf"; vm_profile_t *profile = NULL; - switch_xml_t cfg, xml, settings, param, x_profile, x_profiles; + switch_xml_t cfg, xml, settings, param, x_profile, x_profiles, x_email; memset(&globals, 0, sizeof(globals)); switch_core_new_memory_pool(&globals.pool); @@ -285,11 +289,41 @@ char *storage_dir = ""; char *callback_dialplan = "XML"; char *callback_context = "default"; + char *email_body = ""; + char *email_headers = ""; + char *email_from = ""; + char *date_fmt = "%A, %B %d %Y, %I %M %p"; switch_core_db_t *db; uint32_t timeout = 10000, max_login_attempts = 3, max_record_len = 300; db = NULL; + + if ((x_email = switch_xml_child(x_profile, "email"))) { + if ((param = switch_xml_child(x_email,"body"))) { + email_body = switch_core_strdup(globals.pool,param->txt); + } + + if ((param = switch_xml_child(x_email,"headers"))) { + email_headers = switch_core_strdup(globals.pool,param->txt); + } + + + for (param = switch_xml_child(x_email, "param"); param; param = param->next) { + char *var, *val; + + var = (char *) switch_xml_attr_soft(param, "name"); + val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "date-fmt") && !switch_strlen_zero(val)) { + date_fmt = val; + } else if (!strcasecmp(var, "email-from") && !switch_strlen_zero(val)) { + email_from = val; + } + } + } + + for (param = switch_xml_child(x_profile, "param"); param; param = param->next) { char *var, *val; @@ -430,6 +464,11 @@ #ifdef SWITCH_HAVE_ODBC } #endif + profile->email_body = email_body; + profile->email_headers = email_headers; + profile->email_from = email_from; + profile->date_fmt = date_fmt; + profile->digit_timeout = timeout; profile->max_login_attempts = max_login_attempts; profile->max_record_len = max_record_len; @@ -833,6 +872,55 @@ } +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] = ""; + callback_t cbt = { 0 }; + char sql[256]; + + cbt.buf = msg_count; + cbt.len = sizeof(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", + myid, + domain_name, + myfolder); + vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); + *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='%s'", + myid, + domain_name, + myfolder, + URGENT_FLAG_STRING); + vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); + *total_new_urgent_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", + myid, + domain_name, + myfolder); + vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); + *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='%s'", + myid, + domain_name, + myfolder, + URGENT_FLAG_STRING); + vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); + *total_saved_urgent_messages = atoi(msg_count); + +} + + static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t *profile, listen_callback_t *cbt) { switch_channel_t *channel; @@ -900,28 +988,81 @@ switch_safe_free(sql); if (!strcmp(input, profile->email_key) && !switch_strlen_zero(cbt->email)) { switch_event_t *event; - char *from = switch_core_session_sprintf(session, "%s@%s", cbt->user, cbt->domain); + char *from; char *headers; char *body; int priority = 3; + switch_size_t retsize; + switch_time_exp_t tm; + char date[80] = ""; + char tmp[50]=""; + int total_new_messages = 0; + int total_saved_messages = 0; + int total_new_urgent_messages = 0; + int total_saved_urgent_messages = 0; if (!strcasecmp(cbt->read_flags, URGENT_FLAG_STRING)) { 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); + + + message_count(profile, cbt->user, cbt->domain, cbt->in_folder, &total_new_messages, &total_saved_messages, + &total_new_urgent_messages, &total_saved_urgent_messages); + + switch_time_exp_lt(&tm, atoi(cbt->created_epoch)); + switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm); + + snprintf(tmp,sizeof(tmp), "%d", total_new_messages); + switch_channel_set_variable(channel, "voicemail_total_new_messages", tmp); + snprintf(tmp,sizeof(tmp), "%d", total_saved_messages); + switch_channel_set_variable(channel, "voicemail_total_saved_messages", tmp); + snprintf(tmp,sizeof(tmp), "%d", total_new_urgent_messages); + switch_channel_set_variable(channel, "voicemail_urgent_new_messages", tmp); + snprintf(tmp,sizeof(tmp), "%d", total_saved_urgent_messages); + switch_channel_set_variable(channel, "voicemail_urgent_saved_messages", tmp); + switch_channel_set_variable(channel, "voicemail_current_folder", cbt->in_folder); + switch_channel_set_variable(channel, "voicemail_account", cbt->user); + switch_channel_set_variable(channel, "voicemail_domain", cbt->domain); + switch_channel_set_variable(channel, "voicemail_caller_id_number", cbt->cid_number); + switch_channel_set_variable(channel, "voicemail_caller_id_name", cbt->cid_name); + switch_channel_set_variable(channel, "voicemail_file_path", cbt->file_path); + switch_channel_set_variable(channel, "voicemail_read_flags", cbt->read_flags); + switch_channel_set_variable(channel, "voicemail_time", date); + snprintf(tmp,sizeof(tmp), "%d", priority); + switch_channel_set_variable(channel, "voicemail_priority", tmp); + + + if(switch_strlen_zero(profile->email_headers)) { + from = switch_core_session_sprintf(session, "%s@%s", cbt->user, cbt->domain); + } else { + from = switch_channel_expand_variables(channel,profile->email_from); + } + + if(switch_strlen_zero(profile->email_headers)) { + 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); + } else { + headers = switch_channel_expand_variables(channel,profile->email_headers); + } + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + /* this isnt done? it was in the other place + * switch_channel_event_set_data(channel, event); + */ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Type", "forwarded-voicemail"); - switch_event_serialize(event, &body); switch_event_fire(&event); - } else { + } + + if(!switch_strlen_zero(profile->email_headers)) { body = switch_mprintf("Voicemail from %s %s", cbt->cid_name, cbt->cid_number); + } else { + body = switch_channel_expand_variables(channel,profile->email_body); } - //TBD add better formatting to the body + //TBD add better formatting to the body -- TRX done :) switch_simple_email(cbt->email, from, headers, body, cbt->file_path); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", cbt->email); switch_safe_free(body); @@ -943,55 +1084,6 @@ 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, int *total_new_urgent_messages, int *total_saved_urgent_messages) -{ - char msg_count[80] = ""; - callback_t cbt = { 0 }; - char sql[256]; - - cbt.buf = msg_count; - cbt.len = sizeof(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", - myid, - domain_name, - myfolder); - vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); - *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='%s'", - myid, - domain_name, - myfolder, - URGENT_FLAG_STRING); - vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); - *total_new_urgent_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", - myid, - domain_name, - myfolder); - vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); - *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='%s'", - myid, - domain_name, - myfolder, - URGENT_FLAG_STRING); - vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); - *total_saved_urgent_messages = atoi(msg_count); - -} - - static void voicemail_check_main(switch_core_session_t *session, char *profile_name, char *domain_name, char *id, int auth) { vm_check_state_t vm_check_state = VM_CHECK_START; @@ -1313,11 +1405,6 @@ if (!x_user) { char *xtra; int ok = 1; - /* TRX added destination_number and caller_id_number from the session object - * ideally switch_xml_* would do this for any curl request, but that can get tricky - * since curl & the session object arent always present, I will eventually look at it - * and see what it would take to make it automagically do that - */ caller_profile = switch_channel_get_caller_profile(channel); xtra = switch_mprintf("mailbox=%s&destination_number=%s&caller_id_number=%s", myid,caller_profile->destination_number,caller_profile->caller_id_number); @@ -1505,7 +1592,7 @@ if (!strcasecmp(var, "vm-mailto")) { email_vm = switch_core_session_strdup(session, val); } else if (!strcasecmp(var, "vm-email-all-messages")) { - send_mail = switch_true(var); + send_mail = switch_true(val); } } } @@ -1600,32 +1687,80 @@ } end: - + + if (send_mail && !switch_strlen_zero(email_vm)) { switch_event_t *event; - char *from = switch_core_session_sprintf(session, "%s@%s", id, domain_name); + char *from; 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); + switch_size_t retsize; + switch_time_exp_t tm; + char date[80] = ""; + char tmp[50]=""; + int total_new_messages = 0; + int total_saved_messages = 0; + int total_new_urgent_messages = 0; + int total_saved_urgent_messages = 0; + + message_count(profile, id, domain_name, myfolder, &total_new_messages, &total_saved_messages, + &total_new_urgent_messages, &total_saved_urgent_messages); + + switch_time_exp_lt(&tm, switch_time_now()); + switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm); + + switch_channel_set_variable(channel, "voicemail_current_folder", myfolder); + snprintf(tmp,sizeof(tmp), "%d", total_new_messages); + switch_channel_set_variable(channel, "voicemail_total_new_messages", tmp); + snprintf(tmp,sizeof(tmp), "%d", total_saved_messages); + switch_channel_set_variable(channel, "voicemail_total_saved_messages", tmp); + snprintf(tmp,sizeof(tmp), "%d", total_new_urgent_messages); + switch_channel_set_variable(channel, "voicemail_urgent_new_messages", tmp); + snprintf(tmp,sizeof(tmp), "%d", total_saved_urgent_messages); + switch_channel_set_variable(channel, "voicemail_urgent_saved_messages", tmp); + switch_channel_set_variable(channel, "voicemail_account", id); + switch_channel_set_variable(channel, "voicemail_domain", domain_name); + switch_channel_set_variable(channel, "voicemail_caller_id_number", caller_profile->caller_id_number); + switch_channel_set_variable(channel, "voicemail_caller_id_name", caller_profile->caller_id_name); + switch_channel_set_variable(channel, "voicemail_file_path", file_path); + switch_channel_set_variable(channel, "voicemail_read_flags", read_flags); + switch_channel_set_variable(channel, "voicemail_time", date); + snprintf(tmp,sizeof(tmp), "%d", priority); + switch_channel_set_variable(channel, "voicemail_priority", tmp); + + + if(switch_strlen_zero(profile->email_from)) { + from = switch_core_session_sprintf(session, "%s@%s", id, domain_name); + } else { + 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>\nSubject: 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 (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_serialize(event, &body); switch_event_fire(&event); - } else { + } + if(!switch_strlen_zero(profile->email_headers)) { body = switch_mprintf("Voicemail from %s %s", caller_profile->caller_id_name, caller_profile->caller_id_number); + } else { + body = switch_channel_expand_variables(channel,profile->email_body); } - //TBD add better formatting to the body + //TBD add better formatting to the body -- TRX done :) switch_simple_email(email_vm, from, headers, body, file_path); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", email_vm); switch_safe_free(body);

1 0