diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2009-08-10 15:53:23 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2009-08-10 15:53:23 +0000 |
| commit | bc0a3453cdc2b5544cbf36074b0ea9bc2e30439c (patch) | |
| tree | 0e2a92556be2297fe018ae1b7bba3f0a1016cd1a /channels/chan_dahdi.c | |
| parent | 724c1239fc41020818a279f3587586c437671268 (diff) | |
Restoring some code to sig_pri. Not sure if it is really needed.
Putting some DSP code back into sig_pri that was removed by the
chan_dahdi/sig_pri reorganization.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@211392 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index d704c4aa5..2a979dd66 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -2614,6 +2614,7 @@ static struct sig_pri_callback dahdi_pri_callbacks = .handle_dchan_exception = my_handle_dchan_exception, .play_tone = my_pri_play_tone, .set_echocanceller = my_set_echocanceller, + .dsp_reset_and_flush_digits = my_dsp_reset_and_flush_digits, .lock_private = my_lock_private, .unlock_private = my_unlock_private, .new_ast_channel = my_new_pri_ast_channel, @@ -8040,9 +8041,9 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb i->dsp = NULL; if (i->dsp) { i->dsp_features = features; -#if defined(HAVE_SS7) - /* We cannot do progress detection until receives PROGRESS message */ - if (i->outgoing && (i->sig == SIG_SS7)) { +#if defined(HAVE_PRI) || defined(HAVE_SS7) + /* We cannot do progress detection until receive 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; |