diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-10 17:17:06 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-10 17:17:06 +0000 |
| commit | baf55cdd428ba0054cfa1934d3547159091d2d49 (patch) | |
| tree | f9287d49fb7dd314e24b99ce7a4db302801d6aca | |
| parent | 9849a632bba6475af70a783c6ec50131d0d2d81f (diff) | |
Fix PRI/BRI channels when in alarm condition to only be marked for hangup if
T309 is not enabled.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@211435 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_dahdi.c | 3 | ||||
| -rw-r--r-- | channels/sig_pri.c | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 2a979dd66..ee05f9539 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -6563,9 +6563,6 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) if (p->sig == SIG_PRI || p->sig == SIG_BRI || p->sig == SIG_BRI_PTMP) { sig_pri_chan_alarm_notify(p->sig_pvt, 0); - } else { - if (p->owner) - p->owner->_softhangup |= AST_SOFTHANGUP_DEV; } #endif p->inalarm = 1; diff --git a/channels/sig_pri.c b/channels/sig_pri.c index 6d9bf66b9..307dabe4e 100644 --- a/channels/sig_pri.c +++ b/channels/sig_pri.c @@ -2500,12 +2500,11 @@ void sig_pri_chan_alarm_notify(struct sig_pri_chan *p, int noalarm) } else ast_log(LOG_WARNING, "Failed to grab PRI!\n"); } else - ast_log(LOG_WARNING, "Failed to grab PRI!\n"); - } else - ast_log(LOG_WARNING, "The PRI Call has not been destroyed\n"); + ast_log(LOG_WARNING, "The PRI Call has not been destroyed\n"); + } + if (p->owner) + ast_softhangup_nolock(p->owner, AST_SOFTHANGUP_DEV); } - if (p->owner) - ast_softhangup_nolock(p->owner, AST_SOFTHANGUP_DEV); } else { p->inalarm = 0; } |