diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-31 21:05:23 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-31 21:05:23 +0000 |
| commit | 978f58829db4b0f9615dba2eee1fb58115eb7314 (patch) | |
| tree | d0b16c482169bb44834c15cd2d366ddf1b76bbc0 /channels | |
| parent | 4c09e724527eb21601cd86dd932afdc62a85d5fe (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@31157 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_zap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index c167db2ba..09b06aee0 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -6338,18 +6338,18 @@ static int handle_init_event(struct zt_pvt *i, int event) case ZT_EVENT_NOALARM: i->inalarm = 0; ast_log(LOG_NOTICE, "Alarm cleared on channel %d\n", i->channel); + manager_event(EVENT_FLAG_SYSTEM, "AlarmClear", + "Channel: %d\r\n", i->channel); break; - manager_event(EVENT_FLAG_SYSTEM, "AlarmClear", - "Channel: %d\r\n", i->channel); case ZT_EVENT_ALARM: i->inalarm = 1; res = get_alarms(i); ast_log(LOG_WARNING, "Detected alarm on channel %d: %s\n", i->channel, alarm2str(res)); + manager_event(EVENT_FLAG_SYSTEM, "Alarm", + "Alarm: %s\r\n" + "Channel: %d\r\n", + alarm2str(res), i->channel); /* fall thru intentionally */ - manager_event(EVENT_FLAG_SYSTEM, "Alarm", - "Alarm: %s\r\n" - "Channel: %d\r\n", - alarm2str(res), i->channel); case ZT_EVENT_ONHOOK: if (i->radio) break; /* Back on hook. Hang up. */ |