diff options
| -rw-r--r-- | funcs/func_callerid.c | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c index af0ba1748..f5ea66547 100644 --- a/funcs/func_callerid.c +++ b/funcs/func_callerid.c @@ -66,7 +66,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); @@ -82,7 +83,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); } @@ -124,43 +126,48 @@ 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)) { int i = atoi(value); chan->cid.cid_ani2 = i; } 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); if (chan->cid.cid_rdnis) 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; |