mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-07 18:38:02 +00:00
Merged revisions 131790 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r131790 | tilghman | 2008-07-17 15:35:44 -0500 (Thu, 17 Jul 2008) | 7 lines Revert part of issue #5620 (revision 6965) as it appears that it was in error. This should fix talk call progress on analog lines. (closes issue #12178) Reported by: michael-fig Patches: 20080717__bug12178.diff.txt uploaded by Corydon76 (license 14) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@131791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -5906,12 +5906,13 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb
|
|||||||
else
|
else
|
||||||
i->dsp = NULL;
|
i->dsp = NULL;
|
||||||
if (i->dsp) {
|
if (i->dsp) {
|
||||||
i->dsp_features = features & ~DSP_PROGRESS_TALK;
|
i->dsp_features = features;
|
||||||
#if defined(HAVE_PRI) || defined(HAVE_SS7)
|
#if defined(HAVE_PRI) || defined(HAVE_SS7)
|
||||||
/* We cannot do progress detection until receives PROGRESS message */
|
/* We cannot do progress detection until receives PROGRESS message */
|
||||||
if (i->outgoing && ((i->sig == SIG_PRI) || (i->sig == SIG_BRI) || (i->sig == SIG_BRI_PTMP) || (i->sig == SIG_SS7))) {
|
if (i->outgoing && ((i->sig == SIG_PRI) || (i->sig == SIG_BRI) || (i->sig == SIG_BRI_PTMP) || (i->sig == SIG_SS7))) {
|
||||||
/* Remember requested DSP features, don't treat
|
/* Remember requested DSP features, don't treat
|
||||||
talking as ANSWER */
|
talking as ANSWER */
|
||||||
|
i->dsp_features = features & ~DSP_PROGRESS_TALK;
|
||||||
features = 0;
|
features = 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user