From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 1 Mar 2011 18:50:07 +0000 (+0000)
Subject: Merged revisions 309126 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1813
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72260849b7e61fa0711eb5eb22bcb6664786338f;p=thirdparty%2Fasterisk.git

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
---

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++;