From dca288830a729bccf1589c58b02580e406b18a77 Mon Sep 17 00:00:00 2001 From: Matthew Fredrickson Date: Wed, 6 May 2009 17:41:58 +0000 Subject: [PATCH] Merged revisions 190946 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r190946 | mattf | 2009-04-28 17:05:05 -0500 (Tue, 28 Apr 2009) | 1 line Make sure that we do not clear the down flag on the BRI during PTMP link transients. Also fix no audio bug caused by big early audio patch. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@192811 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_dahdi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 7429cea894..33ea1d0fe6 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -9869,6 +9869,7 @@ static void *ss7_linkset(void *data) ast_debug(1, "Queuing frame PROGRESS on CIC %d\n", p->cic); dahdi_queue_frame(p, &f, linkset); p->progress = 1; + p->dialing = 0; if (p->dsp && p->dsp_features) { ast_dsp_set_features(p->dsp, p->dsp_features); p->dsp_features = 0; @@ -10100,6 +10101,7 @@ static void *ss7_linkset(void *data) ast_mutex_lock(&p->lock); dahdi_queue_frame(p, &f, linkset); p->proceeding = 1; + p->dialing = 0; /* Send alerting if subscriber is free */ if (e->acm.called_party_status_ind == 1) { p->alerting = 1; @@ -10859,7 +10861,7 @@ static void *pri_dchannel(void *vpri) ast_verb(2, "%s D-Channel on span %d up\n", pri_order(which), pri->span); } pri->dchanavail[which] |= DCHAN_UP; - } else { + } else if (pri->sig != SIG_BRI_PTMP) { if (pri->dchanavail[which] & DCHAN_UP) { ast_verb(2, "%s D-Channel on span %d down\n", pri_order(which), pri->span); }