diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-03 22:41:46 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-03 22:41:46 +0000 |
commit | f00656db9ebcc7db98c0e3a3abf9a83791d8bcdb (patch) | |
tree | 2e466f746a2e29094d6dcc3c6f2577f4dd85f4c0 /channels/chan_phone.c | |
parent | 531f260b1278edd05dcabd04422b6a072e75f821 (diff) |
This commit introduces COLP/CONP and Redirecting party information into Asterisk.
The channel drivers which have been most heavily tested with these enhancements are
chan_sip and chan_misdn. Further work is being done to add Q.SIG support and will be
introduced in a later commit. chan_skinny has code added to it here, but according
to user pj, the support on chan_skinny is not working as of now. This will be fixed in
a later commit.
A special thanks goes out to bugtracker user gareth for getting the ball rolling and
providing the initial support for this work. Without his initial work on this, this would
not have been nearly as painless as it was.
This functionality has been tested by Digium's product quality department, as well as a
customer site running thousands of calls every day. In addition, many many many many bugtracker
users have tested this, too.
(closes issue #8824)
Reported by: gareth
Review: http://reviewboard.digium.com/r/201
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@186525 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_phone.c')
-rw-r--r-- | channels/chan_phone.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 82a37cc36..dd1578cb8 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -303,13 +303,13 @@ static int phone_call(struct ast_channel *ast, char *dest, int timeout) snprintf(cid.min, sizeof(cid.min), "%02d", tm.tm_min); } /* the standard format of ast->callerid is: "name" <number>, but not always complete */ - if (ast_strlen_zero(ast->cid.cid_name)) + if (ast_strlen_zero(ast->connected.id.name)) strcpy(cid.name, DEFAULT_CALLER_ID); else - ast_copy_string(cid.name, ast->cid.cid_name, sizeof(cid.name)); + ast_copy_string(cid.name, ast->connected.id.name, sizeof(cid.name)); - if (ast->cid.cid_num) - ast_copy_string(cid.number, ast->cid.cid_num, sizeof(cid.number)); + if (ast->connected.id.number) + ast_copy_string(cid.number, ast->connected.id.number, sizeof(cid.number)); p = ast->tech_pvt; |