diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-19 19:19:28 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-19 19:19:28 +0000 |
| commit | 4816f49f0dfa87d2ffeb06c5eb30b9e29d2d3e1e (patch) | |
| tree | b3bf9fc62ad848b38b699468df74db065d230e9b /channels | |
| parent | 6bf785300e123817bdd8978a39d25351306ad6b5 (diff) | |
Merged revisions 183321 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r183321 | tilghman | 2009-03-19 14:17:31 -0500 (Thu, 19 Mar 2009) | 15 lines
Merged revisions 183319 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r183319 | tilghman | 2009-03-19 14:15:33 -0500 (Thu, 19 Mar 2009) | 8 lines
Delay signalling progress until a PRI channel really signals progress.
(closes issue #13034)
Reported by: klaus3000
Patches:
20090316__bug13034.diff.txt uploaded by tilghman (license 14)
patch_trunk_183progress_klaus3000.txt uploaded by klaus3000 (license 65)
Tested by: klaus3000
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@183333 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 76d79c026..d852ff5c8 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -2720,6 +2720,7 @@ static int dahdi_call(struct ast_channel *ast, char *rdest, int timeout) case SIG_SS7: /* We'll get it in a moment -- but use dialdest to store pre-setup_ack digits */ p->dialdest[0] = '\0'; + p->dialing = 1; break; default: ast_debug(1, "not yet implemented\n"); @@ -3534,6 +3535,7 @@ static int dahdi_hangup(struct ast_channel *ast) p->onhooktime = time(NULL); #if defined(HAVE_PRI) || defined(HAVE_SS7) p->proceeding = 0; + p->dialing = 0; p->progress = 0; p->alerting = 0; p->setup_ack = 0; @@ -3798,6 +3800,7 @@ static int dahdi_answer(struct ast_channel *ast) /* Send a pri acknowledge */ if (!pri_grab(p, p->pri)) { p->proceeding = 1; + p->dialing = 0; res = pri_answer(p->pri->pri, p->call, 0, !p->digital); pri_rel(p->pri); } else { @@ -6113,6 +6116,7 @@ static int dahdi_indicate(struct ast_channel *chan, int condition, const void *d ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->span); } p->proceeding = 1; + p->dialing = 0; } #endif #ifdef HAVE_SS7 @@ -11519,8 +11523,12 @@ static void *pri_dchannel(void *vpri) ast_dsp_set_features(pri->pvts[chanpos]->dsp, pri->pvts[chanpos]->dsp_features); pri->pvts[chanpos]->dsp_features = 0; } + /* Bring voice path up */ + f.subclass = AST_CONTROL_PROGRESS; + dahdi_queue_frame(pri->pvts[chanpos], &f, pri); } pri->pvts[chanpos]->progress = 1; + pri->pvts[chanpos]->dialing = 0; ast_mutex_unlock(&pri->pvts[chanpos]->lock); } } @@ -11550,6 +11558,7 @@ static void *pri_dchannel(void *vpri) dahdi_queue_frame(pri->pvts[chanpos], &f, pri); } pri->pvts[chanpos]->proceeding = 1; + pri->pvts[chanpos]->dialing = 0; ast_mutex_unlock(&pri->pvts[chanpos]->lock); } } |