From 10e378b07ce8cc2ed990fa8175e4a3d17d322eb9 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Tue, 1 Mar 2011 18:44:05 +0000 Subject: [PATCH] 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/branches/1.8@309126 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/sig_analog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/sig_analog.c b/channels/sig_analog.c index 7c35f6b5e3..1b40a9f585 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++; -- 2.47.2