dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@224331 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
jpeeler 2009-10-17 01:36:08 +00:00
parent 3928480e2d
commit f9da7c70a1
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
channels/chan_dahdi.c
View File

@ -5218,6 +5218,9 @@ static int dahdi_hangup(struct ast_channel *ast)
revert_fax_buffers(p, ast);
goto hangup_out;
} else {
p->cid_num[0] = '\0';
p->cid_name[0] = '\0';
}
ast_mutex_lock(&p->lock);
@ -11285,10 +11288,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 (analog_lib_handles(p->sig, p->radio, p->oprmode))
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;

2
channels/sig_pri.c
View File

@ -2410,6 +2410,8 @@ int sig_pri_hangup(struct sig_pri_chan *p, struct ast_channel *ast)
p->progress = 0;
p->alerting = 0;
p->setup_ack = 0;
p->cid_num[0] = '\0';
p->cid_name[0] = '\0';
p->exten[0] = '\0';
sig_pri_set_dialing(p, 0);