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 refix SS7 audio that the early media patch broke.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@192812 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 4ce97eb046400ef7bd87eb09a3d89daabda5b8bb..8a1a9193679acb2c550e3e0de6a9a92c0d0f8a0c 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -10062,6 +10062,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;
@@ -10291,6 +10292,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;
@@ -11050,7 +11052,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);
                                }