From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 27 Feb 2008 16:45:00 +0000 (+0000)
Subject: When we receive a known alarm, make sure that the unknown alarm flag is not still
X-Git-Tag: 1.4.19~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54eaddd0287829a3191ffc1b24913f16286608d1;p=thirdparty%2Fasterisk.git

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)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@104591 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index be49297d81..ab2db946b9 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -3841,6 +3841,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
 				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 @@ static int handle_init_event(struct zt_pvt *i, int event)
 			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);