<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15037] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15037">15037</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2009-10-01 17:43:44 -0500 (Thu, 01 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>convert</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_utilsh">freeswitch/trunk/src/include/switch_utils.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc">freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_utilsc">freeswitch/trunk/src/switch_utils.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_utilsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_utils.h (15036 => 15037)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_utils.h 2009-10-01 22:22:33 UTC (rev 15036)
+++ freeswitch/trunk/src/include/switch_utils.h 2009-10-01 22:43:44 UTC (rev 15037)
</span><span class="lines">@@ -555,7 +555,13 @@
</span><span class="cx"> #define SWITCH_READ_ACCEPTABLE(status) (status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK)
</span><span class="cx"> SWITCH_DECLARE(size_t) switch_url_encode(const char *url, char *buf, size_t len);
</span><span class="cx"> SWITCH_DECLARE(char *) switch_url_decode(char *s);
</span><del>-SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to, const char *from, const char *headers, const char *body, const char *file);
</del><ins>+SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
+ const char *from,
+ const char *headers,
+ const char *body,
+ const char *file,
+ const char *convert_cmd,
+ const char *convert_ext);
</ins><span class="cx"> SWITCH_DECLARE(char *) switch_find_end_paren(const char *s, char open, char close);
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (15036 => 15037)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2009-10-01 22:22:33 UTC (rev 15036)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2009-10-01 22:43:44 UTC (rev 15037)
</span><span class="lines">@@ -130,6 +130,8 @@
</span><span class="cx"> char *web_tail;
</span><span class="cx"> char *email_from;
</span><span class="cx"> char *date_fmt;
</span><ins>+ char *convert_cmd;
+ char *convert_ext;
</ins><span class="cx"> date_location_t play_date_announcement;
</span><span class="cx"> uint32_t digit_timeout;
</span><span class="cx"> uint32_t max_login_attempts;
</span><span class="lines">@@ -553,7 +555,13 @@
</span><span class="cx">
</span><span class="cx"> SWITCH_CONFIG_SET_ITEM(profile->config[i++], "play-date-announcement", SWITCH_CONFIG_ENUM, CONFIG_RELOADABLE,
</span><span class="cx"> &profile->play_date_announcement, VM_DATE_FIRST, &config_play_date_announcement, NULL, NULL);
</span><del>-
</del><ins>+
+ SWITCH_CONFIG_SET_ITEM(profile->config[i++], "convert-cmd", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
+ &profile->convert_cmd, NULL, &profile->config_str_pool, NULL, NULL);
+ SWITCH_CONFIG_SET_ITEM(profile->config[i++], "convert-ext", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
+ &profile->convert_ext, NULL, &profile->config_str_pool, NULL, NULL);
+
+
</ins><span class="cx"> SWITCH_CONFIG_SET_ITEM(profile->config[i++], "digit-timeout", SWITCH_CONFIG_INT, CONFIG_RELOADABLE,
</span><span class="cx"> &profile->digit_timeout, 10000, &config_int_digit_timeout, NULL, NULL);
</span><span class="cx"> SWITCH_CONFIG_SET_ITEM(profile->config[i++], "max-login-attempts", SWITCH_CONFIG_INT, CONFIG_RELOADABLE,
</span><span class="lines">@@ -1232,6 +1240,8 @@
</span><span class="cx"> int want;
</span><span class="cx"> msg_type_t type;
</span><span class="cx"> msg_move_t move;
</span><ins>+ char *convert_cmd;
+ char *convert_ext;
</ins><span class="cx"> };
</span><span class="cx"> typedef struct listen_callback listen_callback_t;
</span><span class="cx">
</span><span class="lines">@@ -1659,7 +1669,7 @@
</span><span class="cx"> body = switch_mprintf("%u second Voicemail from %s %s", message_len, cbt->cid_name, cbt->cid_number);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_simple_email(cbt->email, from, header_string, body, cbt->file_path);
</del><ins>+ switch_simple_email(cbt->email, from, header_string, body, cbt->file_path, cbt->convert_cmd, cbt->convert_ext);
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Sending message to %s\n", cbt->email);
</span><span class="cx"> switch_safe_free(body);
</span><span class="cx"> TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "emailed", NULL, NULL));
</span><span class="lines">@@ -1735,6 +1745,8 @@
</span><span class="cx"> int total_saved_urgent_messages = 0;
</span><span class="cx"> int heard_auto_saved = 0, heard_auto_new = 0;
</span><span class="cx"> char *vm_email = NULL;
</span><ins>+ char *convert_cmd = profile->convert_cmd;
+ char *convert_ext = profile->convert_ext;
</ins><span class="cx"> char *vm_storage_dir = NULL;
</span><span class="cx"> char global_buf[2] = "";
</span><span class="cx"> switch_input_args_t args = { 0 };
</span><span class="lines">@@ -1849,6 +1861,8 @@
</span><span class="cx"> &total_new_urgent_messages, &total_saved_urgent_messages);
</span><span class="cx"> memset(&cbt, 0, sizeof(cbt));
</span><span class="cx"> cbt.email = vm_email;
</span><ins>+ cbt.convert_cmd = convert_cmd;
+ cbt.convert_ext = convert_ext;
</ins><span class="cx"> cbt.move = VM_MOVE_NEXT;
</span><span class="cx"> switch (play_msg_type) {
</span><span class="cx"> case MSG_NEW:
</span><span class="lines">@@ -2154,9 +2168,13 @@
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(var, "vm-mailto")) {
</span><span class="cx"> vm_email = switch_core_session_strdup(session, val);
</span><ins>+ } else if (!strcasecmp(var, "vm-convert-cmd")) {
+ convert_cmd = switch_core_session_strdup(session, val);
+ } else if (!strcasecmp(var, "vm-convert-ext")) {
+ convert_ext = switch_core_session_strdup(session, val);
</ins><span class="cx"> } else if (!strcasecmp(var, "storage-dir")) {
</span><span class="cx"> vm_storage_dir = switch_core_session_strdup(session, val);
</span><del>-
</del><ins>+
</ins><span class="cx"> } else if (!strcasecmp(var, "timezone")) {
</span><span class="cx"> switch_channel_set_variable(channel, var, val);
</span><span class="cx"> }
</span><span class="lines">@@ -2304,7 +2322,9 @@
</span><span class="cx"> const char *tmp;
</span><span class="cx"> switch_event_t *local_event = NULL;
</span><span class="cx"> switch_status_t ret = SWITCH_STATUS_SUCCESS;
</span><del>-
</del><ins>+ char *convert_cmd = profile->convert_cmd;
+ char *convert_ext = profile->convert_ext;
+
</ins><span class="cx"> if (!params) {
</span><span class="cx"> switch_event_create(&local_event, SWITCH_EVENT_REQUEST_PARAMS);
</span><span class="cx"> params = local_event;
</span><span class="lines">@@ -2357,6 +2377,10 @@
</span><span class="cx"> insert_db = switch_true(val);
</span><span class="cx"> } else if (!strcasecmp(var, "vm-attach-file")) {
</span><span class="cx"> email_attach = switch_true(val);
</span><ins>+ } else if (!strcasecmp(var, "vm-convert-cmd")) {
+ convert_cmd = switch_core_strdup(pool, val);
+ } else if (!strcasecmp(var, "vm-convert-ext")) {
+ convert_ext = switch_core_strdup(pool, val);
</ins><span class="cx"> } else if (!strcasecmp(var, "timezone")) {
</span><span class="cx"> vm_timezone = switch_core_strdup(pool, val);
</span><span class="cx"> }
</span><span class="lines">@@ -2528,9 +2552,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (email_attach) {
</span><del>- switch_simple_email(vm_email, from, header_string, body, file_path);
</del><ins>+ switch_simple_email(vm_email, from, header_string, body, file_path, convert_cmd, convert_ext);
</ins><span class="cx"> } else {
</span><del>- switch_simple_email(vm_email, from, header_string, body, NULL);
</del><ins>+ switch_simple_email(vm_email, from, header_string, body, NULL, NULL, NULL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", vm_email);
</span><span class="lines">@@ -2579,7 +2603,7 @@
</span><span class="cx"> body = switch_mprintf("%u second Voicemail from %s %s", message_len, caller_id_name, caller_id_number);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_simple_email(vm_notify_email, from, header_string, body, NULL);
</del><ins>+ switch_simple_email(vm_notify_email, from, header_string, body, NULL, NULL, NULL);
</ins><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending notify message to %s\n", vm_notify_email);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_utilsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_utils.c (15036 => 15037)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_utils.c 2009-10-01 22:22:33 UTC (rev 15036)
+++ freeswitch/trunk/src/switch_utils.c 2009-10-01 22:43:44 UTC (rev 15037)
</span><span class="lines">@@ -429,7 +429,13 @@
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to, const char *from, const char *headers, const char *body, const char *file)
</del><ins>+SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
+ const char *from,
+ const char *headers,
+ const char *body,
+ const char *file,
+ const char *convert_cmd,
+ const char *convert_ext)
</ins><span class="cx"> {
</span><span class="cx"> char *bound = "XXXX_boundary_XXXX";
</span><span class="cx"> const char *mime_type = "audio/inline";
</span><span class="lines">@@ -439,25 +445,47 @@
</span><span class="cx"> unsigned int b = 0, l = 0;
</span><span class="cx"> unsigned char in[B64BUFFLEN];
</span><span class="cx"> unsigned char out[B64BUFFLEN + 512];
</span><ins>+ char *dupfile = NULL, *ext = NULL;
+ char *newfile = NULL;
+ switch_bool_t rval = SWITCH_FALSE;
</ins><span class="cx">
</span><ins>+ if (!switch_strlen_zero(file) && !switch_strlen_zero(convert_cmd) && !switch_strlen_zero(convert_ext)) {
+ if ((ext = strrchr(file, '.'))) {
+ dupfile = strdup(file);
+ if ((ext = strrchr(dupfile, '.'))) {
+ *ext++ = '\0';
+ newfile = switch_mprintf("%s.%s", dupfile, convert_ext);
+ }
+ }
+
+ if (newfile) {
+ char cmd[1024] = "";
+ switch_snprintf(cmd, sizeof(cmd), "%s %s %s", convert_cmd, file, newfile);
+ switch_system(cmd, SWITCH_TRUE);
+ file = newfile;
+ }
+
+ switch_safe_free(dupfile);
+ }
+
</ins><span class="cx"> switch_snprintf(filename, 80, "%smail.%d%04x", SWITCH_GLOBAL_dirs.temp_dir, (int) switch_epoch_time_now(NULL), rand() & 0xffff);
</span><span class="cx">
</span><span class="cx"> if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644))) {
</span><span class="cx"> if (file) {
</span><span class="cx"> if ((ifd = open(file, O_RDONLY | O_BINARY)) < 1) {
</span><del>- return SWITCH_FALSE;
</del><ins>+ rval = SWITCH_FALSE; goto end;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> switch_snprintf(buf, B64BUFFLEN, "MIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=\"%s\"\n", bound);
</span><span class="cx"> if (!write_buf(fd, buf)) {
</span><del>- return SWITCH_FALSE;
</del><ins>+ rval = SWITCH_FALSE; goto end;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (headers && !write_buf(fd, headers))
</span><del>- return SWITCH_FALSE;
</del><ins>+ rval = SWITCH_FALSE; goto end;
</ins><span class="cx">
</span><span class="cx"> if (!write_buf(fd, "\n\n"))
</span><del>- return SWITCH_FALSE;
</del><ins>+ rval = SWITCH_FALSE; goto end;
</ins><span class="cx">
</span><span class="cx"> if (body && switch_stristr("content-type", body)) {
</span><span class="cx"> switch_snprintf(buf, B64BUFFLEN, "--%s\n", bound);
</span><span class="lines">@@ -465,11 +493,11 @@
</span><span class="cx"> switch_snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound);
</span><span class="cx"> }
</span><span class="cx"> if (!write_buf(fd, buf))
</span><del>- return SWITCH_FALSE;
</del><ins>+ rval = SWITCH_FALSE; goto end;
</ins><span class="cx">
</span><span class="cx"> if (body) {
</span><span class="cx"> if (!write_buf(fd, body)) {
</span><del>- return SWITCH_FALSE;
</del><ins>+ rval = SWITCH_FALSE; goto end;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -492,7 +520,7 @@
</span><span class="cx"> "Content-Description: Sound attachment.\n"
</span><span class="cx"> "Content-Disposition: attachment; filename=\"%s\"\n\n", bound, mime_type, stipped_file, stipped_file);
</span><span class="cx"> if (!write_buf(fd, buf))
</span><del>- return SWITCH_FALSE;
</del><ins>+ rval = SWITCH_FALSE; goto end;
</ins><span class="cx">
</span><span class="cx"> while ((ilen = read(ifd, in, B64BUFFLEN))) {
</span><span class="cx"> for (x = 0; x < ilen; x++) {
</span><span class="lines">@@ -507,7 +535,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (write(fd, &out, bytes) != bytes) {
</span><del>- return -1;
</del><ins>+ rval = -1;
</ins><span class="cx"> } else
</span><span class="cx"> bytes = 0;
</span><span class="cx">
</span><span class="lines">@@ -521,14 +549,14 @@
</span><span class="cx"> out[bytes++] = '=', l += 2;
</span><span class="cx"> }
</span><span class="cx"> if (write(fd, &out, bytes) != bytes) {
</span><del>- return -1;
</del><ins>+ rval = -1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_snprintf(buf, B64BUFFLEN, "\n\n--%s--\n.\n", bound);
</span><span class="cx"> if (!write_buf(fd, buf))
</span><del>- return SWITCH_FALSE;
</del><ins>+ rval = SWITCH_FALSE; goto end;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (fd) {
</span><span class="lines">@@ -556,7 +584,16 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Emailed data to [%s]\n", to);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return SWITCH_TRUE;
</del><ins>+ rval = SWITCH_TRUE;
+
+ end:
+
+ if (newfile) {
+ unlink(newfile);
+ free(newfile);
+ }
+
+ return rval;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip)
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>