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 be49297d812d84d87c099e360933b73723f64321..ab2db946b9edd43f2f65060c7de5cef8a561c24d 100644 (file)
--- 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);