diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-14 14:13:45 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-14 14:13:45 +0000 |
| commit | c9a9959fcb3f1d3107e49be8cecf19a535820e63 (patch) | |
| tree | 9f4c3429c50d7a4ec110f77f39cc4cee1fe613bb /channels/chan_local.c | |
| parent | d0cd2b86bfe60cc245297db9656c878ac808ce53 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@64208 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_local.c')
| -rw-r--r-- | channels/chan_local.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index 4b3484b4b..8d588d79a 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -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) |