Merged revisions 64193 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r64193 | murf | 2007-05-14 07:58:42 -0600 (Mon, 14 May 2007) | 1 line

As per 9570, worrisome CDR warnings have been removed, that are either not helpful, or not relevant.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2007-05-14 14:13:45 +00:00
parent 78d3244554
commit a76ff39c0e
3 changed files with 14 additions and 26 deletions

View File

@@ -594,10 +594,22 @@ static struct ast_channel *local_new(struct local_pvt *p, int state)
{
struct ast_channel *tmp = NULL, *tmp2 = NULL;
int randnum = ast_random() & 0xffff, fmt = 0;
const char *t;
int ama;
/* Allocate two new Asterisk channels */
if (!(tmp = ast_channel_alloc(1, state, 0, 0, "", p->exten, p->context, 0, "Local/%s@%s-%04x,1", p->exten, p->context, randnum))
|| !(tmp2 = ast_channel_alloc(1, AST_STATE_RING, 0, 0, "", p->exten, p->context, 0, "Local/%s@%s-%04x,2", p->exten, p->context, randnum))) {
/* safe accountcode */
if (p->owner && p->owner->accountcode)
t = p->owner->accountcode;
else
t = "";
if (p->owner)
ama = p->owner->amaflags;
else
ama = 0;
if (!(tmp = ast_channel_alloc(1, state, 0, 0, t, p->exten, p->context, ama, "Local/%s@%s-%04x,1", p->exten, p->context, randnum))
|| !(tmp2 = ast_channel_alloc(1, AST_STATE_RING, 0, 0, t, p->exten, p->context, ama, "Local/%s@%s-%04x,2", p->exten, p->context, randnum))) {
if (tmp)
ast_channel_free(tmp);
if (tmp2)