kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-20 10:57:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 224331 via svnmerge from

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

................
  r224331 | jpeeler | 2009-10-16 20:36:08 -0500 (Fri, 16 Oct 2009) | 20 lines
  
  Merged revisions 224330 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r224330 | jpeeler | 2009-10-16 20:32:47 -0500 (Fri, 16 Oct 2009) | 13 lines
    
    Fix stale caller id data from being reported in AMI NewChannel event
    
    The problem here is that chan_dahdi is designed in such a way to set
    certain values in the dahdi_pvt only once. One of those such values
    is the configured caller id data in chan_dahdi.conf. For PRI, the
    configured caller id data could be overwritten during a call. Instead
    of saving the data and restoring, it was decided that for all non-analog
    channels it was simply best to not set the configured caller id in the
    first place and also clear it at the end of the call.
    
    (closes issue #15883)
    Reported by: jsmith
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@224334 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2009-10-17 01:58:45 +00:00
parent aed99e4ac1
commit 03871da5fb
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_dahdi.c
+11 -2
View File
@@ -4328,6 +4328,8 @@ static int dahdi_hangup(struct ast_channel *ast)
if ((p->sig == SIG_PRI) || (p->sig == SIG_SS7) || (p->sig == SIG_BRI) || (p->sig == SIG_BRI_PTMP)) {
x = 1;
ast_channel_setoption(ast,AST_OPTION_AUDIO_MODE,&x,sizeof(char),0);
p->cid_num[0] = '\0';
p->cid_name[0] = '\0';
}
x = 0;
@@ -4522,6 +4524,8 @@ static int dahdi_hangup(struct ast_channel *ast)
}
#endif
#ifdef HAVE_OPENR2
p->cid_num[0] = '\0';
p->cid_name[0] = '\0';
if (p->mfcr2 && p->mfcr2call && openr2_chan_get_direction(p->r2chan) != OR2_DIR_STOPPED) {
ast_log(LOG_DEBUG, "disconnecting MFC/R2 call on chan %d\n", p->channel);
/* If it's an incoming call, check the mfcr2_forced_release setting */
@@ -10466,10 +10470,15 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
ast_copy_string(tmp->mohinterpret, conf->chan.mohinterpret, sizeof(tmp->mohinterpret));
ast_copy_string(tmp->mohsuggest, conf->chan.mohsuggest, sizeof(tmp->mohsuggest));
ast_copy_string(tmp->context, conf->chan.context, sizeof(tmp->context));
ast_copy_string(tmp->cid_num, conf->chan.cid_num, sizeof(tmp->cid_num));
ast_copy_string(tmp->parkinglot, conf->chan.parkinglot, sizeof(tmp->parkinglot));
tmp->cid_ton = 0;
ast_copy_string(tmp->cid_name, conf->chan.cid_name, sizeof(tmp->cid_name));
if ((tmp->sig != SIG_PRI) || (tmp->sig != SIG_SS7) || (tmp->sig != SIG_BRI) || (tmp->sig != SIG_BRI_PTMP) || (tmp->sig != SIG_MFCR2)) {
ast_copy_string(tmp->cid_num, conf->chan.cid_num, sizeof(tmp->cid_num));
ast_copy_string(tmp->cid_name, conf->chan.cid_name, sizeof(tmp->cid_name));
} else {
tmp->cid_num[0] = '\0';
tmp->cid_name[0] = '\0';
}
ast_copy_string(tmp->mailbox, conf->chan.mailbox, sizeof(tmp->mailbox));
if (channel != CHAN_PSEUDO && !ast_strlen_zero(tmp->mailbox)) {
char *mailbox, *context;