kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add printed errors to mailer part 2

This commit is contained in:
Anthony Minessale 2012-01-27 13:52:15 -06:00
parent 0b21064a05
commit 7471ec17ed
1 changed files with 121 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

234
src/switch_utils.c
View File

@ -595,7 +595,7 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
char *bound = "XXXX_boundary_XXXX"; char *bound = "XXXX_boundary_XXXX";
const char *mime_type = "audio/inline"; const char *mime_type = "audio/inline";
char filename[80], buf[B64BUFFLEN]; char filename[80], buf[B64BUFFLEN];
int fd = 0, ifd = 0; int fd = -1, ifd = -1;
int x = 0, y = 0, bytes = 0, ilen = 0; int x = 0, y = 0, bytes = 0, ilen = 0;
unsigned int b = 0, l = 0; unsigned int b = 0, l = 0;
unsigned char in[B64BUFFLEN]; unsigned char in[B64BUFFLEN];
@ -604,8 +604,17 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
char *newfile = NULL; char *newfile = NULL;
switch_bool_t rval = SWITCH_FALSE; switch_bool_t rval = SWITCH_FALSE;
const char *err = NULL; const char *err = NULL;
const char *stipped_file;
const char *new_type;
char *xext;
if (!zstr(file) && !zstr(convert_cmd) && !zstr(convert_ext)) { if (zstr(file)) {
err = "Missing file";
rval = SWITCH_FALSE;
goto end;
}
if (!zstr(convert_cmd) && !zstr(convert_ext)) {
if ((ext = strrchr(file, '.'))) { if ((ext = strrchr(file, '.'))) {
dupfile = strdup(file); dupfile = strdup(file);
if ((ext = strrchr(dupfile, '.'))) { if ((ext = strrchr(dupfile, '.'))) {
@ -630,126 +639,118 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
switch_snprintf(filename, 80, "%s%smail.%d%04x", SWITCH_GLOBAL_dirs.temp_dir, SWITCH_PATH_SEPARATOR, (int) switch_epoch_time_now(NULL), rand() & 0xffff); switch_snprintf(filename, 80, "%s%smail.%d%04x", SWITCH_GLOBAL_dirs.temp_dir, SWITCH_PATH_SEPARATOR, (int) switch_epoch_time_now(NULL), rand() & 0xffff);
if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644))) { if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644)) < 0) {
if (file) { err = "Failed to open temp file";
if ((ifd = open(file, O_RDONLY | O_BINARY)) < 1) { rval = SWITCH_FALSE;
rval = SWITCH_FALSE; goto end;
err = "Cannot open tmp file\n"; }
goto end;
if ((ifd = open(file, O_RDONLY | O_BINARY)) < 0) {
rval = SWITCH_FALSE;
err = "Failed to open source file\n";
goto end;
}
switch_snprintf(buf, B64BUFFLEN, "MIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=\"%s\"\n", bound);
if (!write_buf(fd, buf)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
if (headers && !write_buf(fd, headers)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
if (!write_buf(fd, "\n\n")) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
if (body && switch_stristr("content-type", body)) {
switch_snprintf(buf, B64BUFFLEN, "--%s\n", bound);
} else {
switch_snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound);
}
if (!write_buf(fd, buf)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
if (body) {
if (!write_buf(fd, body)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
}
stipped_file = switch_cut_path(file);
if ((xext = strrchr(stipped_file, '.'))) {
xext++;
if ((new_type = switch_core_mime_ext2type(xext))) {
mime_type = new_type;
}
}
switch_snprintf(buf, B64BUFFLEN,
"\n\n--%s\nContent-Type: %s; name=\"%s\"\n"
"Content-ID: <ATTACHED@freeswitch.org>\n"
"Content-Transfer-Encoding: base64\n"
"Content-Description: Sound attachment.\n"
"Content-Disposition: attachment; filename=\"%s\"\n\n", bound, mime_type, stipped_file, stipped_file);
if (!write_buf(fd, buf)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
while ((ilen = read(ifd, in, B64BUFFLEN))) {
for (x = 0; x < ilen; x++) {
b = (b << 8) + in[x];
l += 8;
while (l >= 6) {
out[bytes++] = switch_b64_table[(b >> (l -= 6)) % 64];
if (++y != 72)
continue;
out[bytes++] = '\n';
y = 0;
} }
} }
switch_snprintf(buf, B64BUFFLEN, "MIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=\"%s\"\n", bound); if (write(fd, &out, bytes) != bytes) {
if (!write_buf(fd, buf)) { rval = -1;
rval = SWITCH_FALSE; break;
err = "write error.";
goto end;
}
if (headers && !write_buf(fd, headers)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
if (!write_buf(fd, "\n\n")) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
if (body && switch_stristr("content-type", body)) {
switch_snprintf(buf, B64BUFFLEN, "--%s\n", bound);
} else { } else {
switch_snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound); bytes = 0;
}
if (!write_buf(fd, buf)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
} }
if (body) {
if (!write_buf(fd, body)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
}
if (file) {
const char *stipped_file = switch_cut_path(file);
const char *new_type;
char *ext;
if ((ext = strrchr(stipped_file, '.'))) {
ext++;
if ((new_type = switch_core_mime_ext2type(ext))) {
mime_type = new_type;
}
}
switch_snprintf(buf, B64BUFFLEN,
"\n\n--%s\nContent-Type: %s; name=\"%s\"\n"
"Content-ID: <ATTACHED@freeswitch.org>\n"
"Content-Transfer-Encoding: base64\n"
"Content-Description: Sound attachment.\n"
"Content-Disposition: attachment; filename=\"%s\"\n\n", bound, mime_type, stipped_file, stipped_file);
if (!write_buf(fd, buf)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
while ((ilen = read(ifd, in, B64BUFFLEN))) {
for (x = 0; x < ilen; x++) {
b = (b << 8) + in[x];
l += 8;
while (l >= 6) {
out[bytes++] = switch_b64_table[(b >> (l -= 6)) % 64];
if (++y != 72)
continue;
out[bytes++] = '\n';
y = 0;
}
}
if (write(fd, &out, bytes) != bytes) {
rval = -1;
break;
} else {
bytes = 0;
}
}
if (l > 0) {
out[bytes++] = switch_b64_table[((b % 16) << (6 - l)) % 64];
}
if (l != 0)
while (l < 6) {
out[bytes++] = '=', l += 2;
}
if (write(fd, &out, bytes) != bytes) {
rval = -1;
}
}
switch_snprintf(buf, B64BUFFLEN, "\n\n--%s--\n.\n", bound);
if (!write_buf(fd, buf)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
} }
if (fd) { if (l > 0) {
close(fd); out[bytes++] = switch_b64_table[((b % 16) << (6 - l)) % 64];
}
if (ifd) {
close(ifd);
} }
if (l != 0)
while (l < 6) {
out[bytes++] = '=', l += 2;
}
if (write(fd, &out, bytes) != bytes) {
rval = -1;
}
switch_snprintf(buf, B64BUFFLEN, "\n\n--%s--\n.\n", bound);
if (!write_buf(fd, buf)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
if (zstr(from)) { if (zstr(from)) {
from = "freeswitch"; from = "freeswitch";
} }
@ -780,6 +781,13 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
end: end:
if (fd > -1) {
close(fd);
}
if (ifd > -1) {
close(ifd);
}
if (newfile) { if (newfile) {
unlink(newfile); unlink(newfile);
free(newfile); free(newfile);