diff options
| author | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-06 17:57:14 +0000 |
|---|---|---|
| committer | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-06 17:57:14 +0000 |
| commit | 0b72fbb293e74a74a5feab8293e4228dd16e9be1 (patch) | |
| tree | b870e57d3380f6f6bfe32dca8ad42f64ad517997 /channels | |
| parent | 1647d89134193e7c69289f3c934f479e0b8f6271 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@192813 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 19050ce7b..9c684601a 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -11425,6 +11425,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; @@ -11655,6 +11656,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; @@ -12509,7 +12511,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); } |