Make sure that we do not clear the down flag on the BRI during PTMP link transients
authorMatthew Fredrickson <creslin@digium.com>
Tue, 28 Apr 2009 22:05:05 +0000 (22:05 +0000)
committerMatthew Fredrickson <creslin@digium.com>
Tue, 28 Apr 2009 22:05:05 +0000 (22:05 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@190946 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_dahdi.c

index 44b854a..0c01c79 100644 (file)
@@ -11501,6 +11501,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;
@@ -11731,6 +11732,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;
@@ -12612,7 +12614,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);
                                }