diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-08-03 20:52:20 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-08-03 20:52:20 +0000 |
| commit | f8d0dcac122feafe9ebd0aba502263f829c77667 (patch) | |
| tree | 941ab22705ecf272616cda8c1ee04d5a8a267286 /channels/chan_dahdi.c | |
| parent | 27ff1247e65dcf7fd07faff050128e8811215076 (diff) | |
Merged revisions 280811 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r280811 | tilghman | 2010-08-03 15:49:10 -0500 (Tue, 03 Aug 2010) | 9 lines
Prevent DAHDI channels from overriding the callerid, once it's been set by the user.
(closes issue #16661)
Reported by: jstapleton
Patches:
20100414__issue16661.diff.txt uploaded by tilghman (license 14)
20100415__issue16661__1.6.2.diff.txt uploaded by tilghman (license 14)
Tested by: jstapleton
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@280812 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index b44c70bec..fb45564e3 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -6892,7 +6892,7 @@ static struct ast_frame *dahdi_read(struct ast_channel *ast) return &p->subs[idx].f; } - if (p->subs[idx].needcallerid) { + if (p->subs[idx].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) @@ -13296,12 +13296,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); } |