[asterisk-commits] rmudgett: branch 1.8 r309126 - /branches/1.8/channels/sig_analog.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Mar  1 12:44:05 2011
New Revision: 309126

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=309126
Log:
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

Modified:
    branches/1.8/channels/sig_analog.c

Modified: branches/1.8/channels/sig_analog.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/sig_analog.c?view=diff&rev=309126&r1=309125&r2=309126
==============================================================================
--- branches/1.8/channels/sig_analog.c (original)
+++ branches/1.8/channels/sig_analog.c Tue Mar  1 12:44:05 2011
@@ -3019,7 +3019,6 @@
 			break;
 		}
 		break;
-#ifdef ANALOG_EVENT_RINGBEGIN
 	case ANALOG_EVENT_RINGBEGIN:
 		switch (p->sig) {
 		case ANALOG_SIG_FXSLS:
@@ -3029,9 +3028,10 @@
 				analog_set_ringtimeout(p, p->ringt_base);
 			}
 			break;
-		}
-		break;
-#endif
+		default:
+			break;
+		}
+		break;
 	case ANALOG_EVENT_RINGEROFF:
 		if (p->inalarm) break;
 		ast->rings++;