[svn-commits] russell: branch 1.4 r104591 - /branches/1.4/channels/chan_zap.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Feb 27 10:45:00 2008
New Revision: 104591

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104591
Log:
When we receive a known alarm, make sure that the unknown alarm flag is not still
set to make sure that when we come back out of alarm, it gets reported in the log
and manager interface (after discussion with tzafrir on the -dev list)

Modified:
    branches/1.4/channels/chan_zap.c

Modified: branches/1.4/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_zap.c?view=diff&rev=104591&r1=104590&r2=104591
==============================================================================
--- branches/1.4/channels/chan_zap.c (original)
+++ branches/1.4/channels/chan_zap.c Wed Feb 27 10:45:00 2008
@@ -3841,6 +3841,8 @@
 				if (!strcasecmp(alarm_str, "No Alarm") || !strcasecmp(alarm_str, "Unknown Alarm")) {
 					p->unknown_alarm = 1;
 					break;
+				} else {
+					p->unknown_alarm = 0;
 				}
 					
 				ast_log(LOG_WARNING, "Detected alarm on channel %d: %s\n", p->channel, alarm_str);
@@ -6710,6 +6712,8 @@
 			if (!strcasecmp(alarm_str, "No Alarm") || !strcasecmp(alarm_str, "Unknown Alarm")) {
 				i->unknown_alarm = 1;
 				break;
+			} else {
+				i->unknown_alarm = 0;
 			}
 
 			ast_log(LOG_WARNING, "Detected alarm on channel %d: %s\n", i->channel, alarm_str);