[svn-commits] jpeeler: branch jpeeler/asterisk-sigwork-trunk r205470 - /team/jpeeler/asteri...

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Wed Jul  8 18:12:15 2009
New Revision: 205470

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=205470
Log:
a safer change, only ignore the events that must normally occur during a ring for distinctive ring detection

Modified:
    team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c

Modified: team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c?view=diff&rev=205470&r1=205469&r2=205470
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c Wed Jul  8 18:12:15 2009
@@ -2008,9 +2008,9 @@
 							p->polarity = POLARITY_IDLE;
 							ast_hangup(chan);
 							goto quit;
-						} //else if (ev != ANALOG_EVENT_NONE) { 
-//							break;
-//						}
+						} else if (ev != ANALOG_EVENT_NONE && ev != ANALOG_EVENT_RINGBEGIN && ev != ANALOG_EVENT_RINGOFFHOOK) { 
+							break;
+						}
 						if (res != 2) {
 							/* Let us detect callerid when the telco uses distinctive ring */
 							curRingData[receivedRingT] = p->ringt;