diff options
| author | Terry Wilson <twilson@digium.com> | 2012-02-29 16:52:47 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-02-29 16:52:47 +0000 |
| commit | a9d607a35764d93790172cab1f630e14fb8e043c (patch) | |
| tree | dadea55813cfc525898844c51eec824d468455cb /main/cdr.c | |
| parent | 0b988da21c1ec856b7b8bad2434bf93498d17cfd (diff) | |
Opaquify ast_channel structs and lists
Review: https://reviewboard.asterisk.org/r/1773/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@357542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/cdr.c')
| -rw-r--r-- | main/cdr.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/main/cdr.c b/main/cdr.c index af6885308..29deb2fe9 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -893,18 +893,18 @@ static void set_one_cid(struct ast_cdr *cdr, struct ast_channel *c) } /* Grab source from ANI or normal Caller*ID */ - num = S_COR(c->caller.ani.number.valid, c->caller.ani.number.str, - S_COR(c->caller.id.number.valid, c->caller.id.number.str, NULL)); + num = S_COR(ast_channel_caller(c)->ani.number.valid, ast_channel_caller(c)->ani.number.str, + S_COR(ast_channel_caller(c)->id.number.valid, ast_channel_caller(c)->id.number.str, NULL)); ast_callerid_merge(cdr->clid, sizeof(cdr->clid), - S_COR(c->caller.id.name.valid, c->caller.id.name.str, NULL), num, ""); + S_COR(ast_channel_caller(c)->id.name.valid, ast_channel_caller(c)->id.name.str, NULL), num, ""); ast_copy_string(cdr->src, S_OR(num, ""), sizeof(cdr->src)); - ast_cdr_setvar(cdr, "dnid", S_OR(c->dialed.number.str, ""), 0); + ast_cdr_setvar(cdr, "dnid", S_OR(ast_channel_dialed(c)->number.str, ""), 0); - if (c->caller.id.subaddress.valid) { - ast_cdr_setvar(cdr, "callingsubaddr", S_OR(c->caller.id.subaddress.str, ""), 0); + if (ast_channel_caller(c)->id.subaddress.valid) { + ast_cdr_setvar(cdr, "callingsubaddr", S_OR(ast_channel_caller(c)->id.subaddress.str, ""), 0); } - if (c->dialed.subaddress.valid) { - ast_cdr_setvar(cdr, "calledsubaddr", S_OR(c->dialed.subaddress.str, ""), 0); + if (ast_channel_dialed(c)->subaddress.valid) { + ast_cdr_setvar(cdr, "calledsubaddr", S_OR(ast_channel_dialed(c)->subaddress.str, ""), 0); } } |