diff options
| author | Steve Murphy <murf@digium.com> | 2007-04-10 05:41:34 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2007-04-10 05:41:34 +0000 |
| commit | ecaf7819337745bba5fd6a4a3a031ba2c77da331 (patch) | |
| tree | 9a564f15ac25870f7fe98c097760dd5729177206 /apps | |
| parent | be874b92d36bb654b80ecd74ea494d7ea5850b81 (diff) | |
Merged revisions 60989 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r60989 | murf | 2007-04-09 12:32:07 -0600 (Mon, 09 Apr 2007) | 1 line
This is a big improvement over the current CDR fixes. It may still need refinement, but this won't have as many folks bothered.
This also adds the mods from 1.4/r.61136;
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_cdr.c | 3 | ||||
| -rw-r--r-- | apps/app_voicemail.c | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/apps/app_cdr.c b/apps/app_cdr.c index 60e48d7a2..c0d88fbbb 100644 --- a/apps/app_cdr.c +++ b/apps/app_cdr.c @@ -51,8 +51,7 @@ static int nocdr_exec(struct ast_channel *chan, void *data) u = ast_module_user_add(chan); if (chan->cdr) { - ast_cdr_free(chan->cdr); - chan->cdr = NULL; + ast_set_flag(chan->cdr, AST_CDR_FLAG_POST_DISABLED); } ast_module_user_remove(u); diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index b603f36e3..668915e1c 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1914,7 +1914,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in if (!ast_strlen_zero(fromstring)) { struct ast_channel *ast; - if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, 0))) { + if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) { char *passdata; int vmlen = strlen(fromstring)*3 + 200; if ((passdata = alloca(vmlen))) { @@ -1936,7 +1936,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in fprintf(p, "To: %s <%s>" ENDL, quote(vmu->fullname, passdata2, len_passdata), vmu->email); if (!ast_strlen_zero(emailsubject)) { struct ast_channel *ast; - if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, 0))) { + if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) { char *passdata; int vmlen = strlen(emailsubject) * 3 + 200; if ((passdata = alloca(vmlen))) { @@ -1990,7 +1990,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in fprintf(p, "Content-Type: text/plain; charset=%s" ENDL "Content-Transfer-Encoding: 8bit" ENDL ENDL, charset); if (emailbody) { struct ast_channel *ast; - if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, 0))) { + if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) { char *passdata; int vmlen = strlen(emailbody)*3 + 200; if ((passdata = alloca(vmlen))) { @@ -2109,7 +2109,7 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char if (*pagerfromstring) { struct ast_channel *ast; - if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, 0))) { + if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) { char *passdata; int vmlen = strlen(fromstring)*3 + 200; if ((passdata = alloca(vmlen))) { @@ -2127,7 +2127,7 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char fprintf(p, "To: %s\n", pager); if (pagersubject) { struct ast_channel *ast; - if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, 0))) { + if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) { char *passdata; int vmlen = strlen(pagersubject) * 3 + 200; if ((passdata = alloca(vmlen))) { @@ -2146,7 +2146,7 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char strftime(date, sizeof(date), "%A, %B %d, %Y at %r", &tm); if (pagerbody) { struct ast_channel *ast; - if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, 0))) { + if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) { char *passdata; int vmlen = strlen(pagerbody)*3 + 200; if ((passdata = alloca(vmlen))) { |