kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 09:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 160854 via svnmerge from

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

........
  r160854 | rmudgett | 2008-12-03 19:14:22 -0600 (Wed, 03 Dec 2008) | 4 lines
  
  *  Found a couple more places where num/number needed to be done
  so 1.4 upgraders will not have problems.
  *  Added curly braces and minor tweaks.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2008-12-04 01:40:51 +00:00
parent a8bc1d2476
commit 2688e5ff67
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
funcs/func_callerid.c
View File

@@ -69,7 +69,8 @@ static int callerid_read(struct ast_channel *chan, const char *cmd, char *data,
snprintf(buf, len, "\"%s\" <%s>", name, num);
} else if (!strncasecmp("name", data, 4)) {
ast_copy_string(buf, name, len);
} else if (!strncasecmp("num", data, 3)) {
} else if (!strncasecmp("num", data, 3)
|| !strncasecmp("number", data, 6)) {
ast_copy_string(buf, num, len);
} else {
ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data);
@@ -85,7 +86,8 @@ static int callerid_read(struct ast_channel *chan, const char *cmd, char *data,
if (chan->cid.cid_name) {
ast_copy_string(buf, chan->cid.cid_name, len);
}
} else if (!strncasecmp("num", data, 3)) {
} else if (!strncasecmp("num", data, 3)
|| !strncasecmp("number", data, 6)) {
if (chan->cid.cid_num) {
ast_copy_string(buf, chan->cid.cid_num, len);
}
@@ -129,36 +131,40 @@ 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))) {
ast_set_callerid(chan, num, name, num);
if (chan->cdr)
ast_cdr_setcid(chan->cdr, chan);
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)
if (chan->cdr) {
ast_cdr_setcid(chan->cdr, chan);
} else if (!strncasecmp("num", data, 3) ||
!strncasecmp("number", data, 6)) {
}
} else if (!strncasecmp("num", data, 3)
|| !strncasecmp("number", data, 6)) {
ast_set_callerid(chan, value, NULL, NULL);
if (chan->cdr)
if (chan->cdr) {
ast_cdr_setcid(chan->cdr, chan);
}
} else if (!strncasecmp("ani", data, 3)) {
if (!strncasecmp(data + 3, "2", 1)) {
chan->cid.cid_ani2 = atoi(value);
} else {
ast_set_callerid(chan, NULL, NULL, value);
}
if (chan->cdr)
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)
if (chan->cdr) {
ast_cdr_setcid(chan->cdr, chan);
}
ast_channel_unlock(chan);
} else if (!strncasecmp("rdnis", data, 5)) {
ast_channel_lock(chan);
@@ -166,8 +172,9 @@ static int callerid_write(struct ast_channel *chan, const char *cmd, char *data,
ast_free(chan->cid.cid_rdnis);
}
chan->cid.cid_rdnis = ast_strdup(value);
if (chan->cdr)
if (chan->cdr) {
ast_cdr_setcid(chan->cdr, chan);
}
ast_channel_unlock(chan);
} else if (!strncasecmp("pres", data, 4)) {
int i;