[svn-commits] mattf: branch 1.6.0 r192811 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Wed May  6 12:41:58 2009
New Revision: 192811

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=192811
Log:
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.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_dahdi.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=192811&r1=192810&r2=192811
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Wed May  6 12:41:58 2009
@@ -9869,6 +9869,7 @@
 						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 @@
 					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 @@
 					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);
 				}