kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 19:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 160760 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r160760 | murf | 2008-12-03 14:09:15 -0700 (Wed, 03 Dec 2008) | 23 lines

Merged revisions 160703 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r160703 | murf | 2008-12-03 13:41:42 -0700 (Wed, 03 Dec 2008) | 11 lines

(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.

I also notice that in trunk, the num/number of 1.4 is
left out; I decided to include the option to use
either in trunk, so as not to have 1.4 upgraders
not to have problems.


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@160761 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2008-12-03 21:23:23 +00:00
parent 69e24fffbf
commit 5acbac37b5
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
funcs/func_callerid.c
View File

@@ -124,29 +124,43 @@ static int callerid_write(struct ast_channel *chan, const 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);
} else if (!strncasecmp("num", data, 3)) {
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)) {
if (!strncasecmp(data + 3, "2", 1)) {
int i = atoi(value);
chan->cid.cid_ani2 = i;
} else
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)
ast_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)
ast_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 if (!strncasecmp("pres", data, 4)) {
int i;