diff options
| -rw-r--r-- | channels/chan_dahdi.c | 6 | ||||
| -rw-r--r-- | funcs/func_callerid.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 1e4713c6d..a4e549a6f 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -5250,7 +5250,7 @@ static struct ast_frame *dahdi_read(struct ast_channel *ast) return &p->subs[index].f; } - if (p->subs[index].needcallerid) { + if (p->subs[index].needcallerid && !ast->cid.cid_tns) { ast_set_callerid(ast, S_OR(p->lastcid_num, NULL), S_OR(p->lastcid_name, NULL), S_OR(p->lastcid_num, NULL) @@ -9815,12 +9815,12 @@ static void *pri_dchannel(void *vpri) if (chanpos < 0) { ast_log(LOG_WARNING, "Facility Name requested on channel %d/%d not in use on span %d\n", PRI_SPAN(e->facname.channel), PRI_CHANNEL(e->facname.channel), pri->span); - } else { + } else if (pri->pvts[chanpos]->use_callerid) { /* Re-use *69 field for PRI */ ast_mutex_lock(&pri->pvts[chanpos]->lock); ast_copy_string(pri->pvts[chanpos]->lastcid_num, e->facname.callingnum, sizeof(pri->pvts[chanpos]->lastcid_num)); ast_copy_string(pri->pvts[chanpos]->lastcid_name, e->facname.callingname, sizeof(pri->pvts[chanpos]->lastcid_name)); - pri->pvts[chanpos]->subs[SUB_REAL].needcallerid =1; + pri->pvts[chanpos]->subs[SUB_REAL].needcallerid = 1; dahdi_enable_ec(pri->pvts[chanpos]); ast_mutex_unlock(&pri->pvts[chanpos]->lock); } diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c index 86c54883e..418878fda 100644 --- a/funcs/func_callerid.c +++ b/funcs/func_callerid.c @@ -114,6 +114,7 @@ static int callerid_read(struct ast_channel *chan, char *cmd, char *data, static int callerid_write(struct ast_channel *chan, char *cmd, char *data, const char *value) { + int valid = 1; if (!value || !chan) return -1; @@ -157,6 +158,11 @@ static int callerid_write(struct ast_channel *chan, char *cmd, char *data, ast_channel_unlock(chan); } else { ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data); + valid = 0; + } + + if (valid) { + chan->cid.cid_tns = 1; } return 0; |