aboutsummaryrefslogtreecommitdiffstats
path: root/funcs
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-03 20:41:42 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-03 20:41:42 +0000
commit3c5bbb6817fdb026c865da653e5b059aec6ef4cd (patch)
treeaa26c6e33223b516a932d0b437e4ec827d9d31e7 /funcs
parent025e86166edb8fdf2e2c80e38062c619d686a9f9 (diff)
(closes issue #13597)
Reported by: john8675309 Patches: patch.13597 uploaded by murf (license 17) Tested by: murf, john8675309 This patch causes the setcid func to update the CDR clid after setting the channel field. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@160703 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
-rw-r--r--funcs/func_callerid.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c
index 19b8f413f..86c54883e 100644
--- a/funcs/func_callerid.c
+++ b/funcs/func_callerid.c
@@ -121,26 +121,39 @@ static int callerid_write(struct ast_channel *chan, char *cmd, char *data,
char name[256];
char num[256];
- if (!ast_callerid_split(value, name, sizeof(name), num, sizeof(num)))
+ if (!ast_callerid_split(value, name, sizeof(name), num, sizeof(num))) {
ast_set_callerid(chan, num, name, num);
+ if (chan->cdr)
+ ast_cdr_setcid(chan->cdr, chan);
+ }
} else if (!strncasecmp("name", data, 4)) {
ast_set_callerid(chan, NULL, value, NULL);
+ if (chan->cdr)
+ ast_cdr_setcid(chan->cdr, chan);
} else if (!strncasecmp("num", data, 3) ||
!strncasecmp("number", data, 6)) {
ast_set_callerid(chan, value, NULL, NULL);
+ if (chan->cdr)
+ ast_cdr_setcid(chan->cdr, chan);
} else if (!strncasecmp("ani", data, 3)) {
ast_set_callerid(chan, NULL, NULL, value);
+ if (chan->cdr)
+ ast_cdr_setcid(chan->cdr, chan);
} else if (!strncasecmp("dnid", data, 4)) {
ast_channel_lock(chan);
if (chan->cid.cid_dnid)
free(chan->cid.cid_dnid);
chan->cid.cid_dnid = ast_strdup(value);
+ if (chan->cdr)
+ ast_cdr_setcid(chan->cdr, chan);
ast_channel_unlock(chan);
} else if (!strncasecmp("rdnis", data, 5)) {
ast_channel_lock(chan);
if (chan->cid.cid_rdnis)
free(chan->cid.cid_rdnis);
chan->cid.cid_rdnis = ast_strdup(value);
+ if (chan->cdr)
+ ast_cdr_setcid(chan->cdr, chan);
ast_channel_unlock(chan);
} else {
ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data);