diff options
| -rw-r--r-- | channels/chan_dahdi.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index b2b0668a0..5a76cf5fe 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -3380,6 +3380,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; @@ -8974,9 +8976,14 @@ 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)); tmp->cid_ton = 0; - ast_copy_string(tmp->cid_name, conf->chan.cid_name, sizeof(tmp->cid_name)); + if ((p->sig != SIG_PRI) || (p->sig != SIG_SS7) || (p->sig != SIG_BRI) || (p->sig != SIG_BRI_PTMP)) { + 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; |