diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-17 20:37:14 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-17 20:37:14 +0000 |
| commit | 4a7d07dc0198cb7cc311e66a26d4c4128f966ce9 (patch) | |
| tree | f589274aa5c4c84eb5738538571c8cd35e02f542 /channels | |
| parent | 1fc317c74de770ca35222fe2750d5e78798c01ed (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@131791 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 640df5599..419100212 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -5906,12 +5906,13 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb else i->dsp = NULL; if (i->dsp) { - i->dsp_features = features & ~DSP_PROGRESS_TALK; + i->dsp_features = features; #if defined(HAVE_PRI) || defined(HAVE_SS7) /* 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))) { /* Remember requested DSP features, don't treat talking as ANSWER */ + i->dsp_features = features & ~DSP_PROGRESS_TALK; features = 0; } #endif |