diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-06 18:53:32 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-06 18:53:32 +0000 |
| commit | 493b78df787530aff23314d6a687ffa788506621 (patch) | |
| tree | 04ffcd2e070bea6910e52f78529942ae2634b7ce /channels/chan_dahdi.c | |
| parent | 7dbeaf262e00d03227a23af30bbc45ad3b1a6714 (diff) | |
CallerID channel DAHDI port FXS are empty after the first call.
The bug is exposed if MFC/R2 support is built into asterisk (i.e.,
openr2.h is present in the include path). Code that unconditionally
clears the CallerID name and number is included.
Also fixed a malformed if test in mkintf() added by issue 15883.
Converted the if statement to a switch statement for clarity.
Regression of the issue 15883 fix.
(closes issue #16968)
Reported by: grecco
Patches:
issue16968.patch uploaded by rmudgett (license 664)
(closes issue #16747)
Reported by: viniciusfontes
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@256368 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 49db2b055..d20fc07bf 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -4330,11 +4330,20 @@ static int dahdi_hangup(struct ast_channel *ast) idx = dahdi_get_index(ast, p, 1); - if ((p->sig == SIG_PRI) || (p->sig == SIG_SS7) || (p->sig == SIG_BRI) || (p->sig == SIG_BRI_PTMP)) { + switch (p->sig) { + case SIG_PRI: + case SIG_BRI: + case SIG_BRI_PTMP: + case SIG_SS7: x = 1; ast_channel_setoption(ast,AST_OPTION_AUDIO_MODE,&x,sizeof(char),0); + /* Fall through */ + case SIG_MFCR2: p->cid_num[0] = '\0'; p->cid_name[0] = '\0'; + break; + default: + break; } x = 0; @@ -4529,8 +4538,6 @@ 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 */ @@ -10503,12 +10510,19 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, ast_copy_string(tmp->context, conf->chan.context, sizeof(tmp->context)); ast_copy_string(tmp->parkinglot, conf->chan.parkinglot, sizeof(tmp->parkinglot)); tmp->cid_ton = 0; - 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 { + switch (tmp->sig) { + case SIG_PRI: + case SIG_BRI: + case SIG_BRI_PTMP: + case SIG_SS7: + case SIG_MFCR2: tmp->cid_num[0] = '\0'; tmp->cid_name[0] = '\0'; + break; + default: + 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)); + break; } ast_copy_string(tmp->mailbox, conf->chan.mailbox, sizeof(tmp->mailbox)); if (channel != CHAN_PSEUDO && !ast_strlen_zero(tmp->mailbox)) { |