diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2011-03-01 18:50:07 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2011-03-01 18:50:07 +0000 |
| commit | 72260849b7e61fa0711eb5eb22bcb6664786338f (patch) | |
| tree | 69ab9305f079678a401bc41acf0328c7c9361d91 /channels/sig_analog.c | |
| parent | 8e603ab4e1d427079c257875de7c870730d590b7 (diff) | |
Merged revisions 309126 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r309126 | rmudgett | 2011-03-01 12:44:05 -0600 (Tue, 01 Mar 2011) | 16 lines
Chan_dahdi does not retain CID when detecting DTMF CID without polarity reversal.
Looks like an unintended change when sig_analog.c was extracted from
chan_dahdi.c.
Removed useless conditional around needed code and fixed resulting
compiler warning.
(closes issue #18667)
Reported by: enegaard
Patches:
issue18667.patch uploaded by enegaard (license 1197)
Tested by: enegaard
JIRA SWP-2965
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@309127 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_analog.c')
| -rw-r--r-- | channels/sig_analog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/sig_analog.c b/channels/sig_analog.c index 7c35f6b5e..1b40a9f58 100644 --- a/channels/sig_analog.c +++ b/channels/sig_analog.c @@ -3019,7 +3019,6 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_ break; } break; -#ifdef ANALOG_EVENT_RINGBEGIN case ANALOG_EVENT_RINGBEGIN: switch (p->sig) { case ANALOG_SIG_FXSLS: @@ -3029,9 +3028,10 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_ analog_set_ringtimeout(p, p->ringt_base); } break; + default: + break; } break; -#endif case ANALOG_EVENT_RINGEROFF: if (p->inalarm) break; ast->rings++; |