[asterisk-commits] trunk r25124 - in /trunk: ./ channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Fri May  5 19:06:58 2006
New Revision: 25124

URL: http://svn.digium.com/view/asterisk?rev=25124&view=rev
Log:
Merged revisions 25123 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r25123 | russell | 2006-05-05 20:05:27 -0400 (Fri, 05 May 2006) | 3 lines

ensure that the appropriate manager events are sent in all of the places where
alarms are detected or cleared (issue #6866, flefoll)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_zap.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?rev=25124&r1=25123&r2=25124&view=diff
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Fri May  5 19:06:58 2006
@@ -6431,11 +6431,17 @@
 		i->inalarm = 0;
 		ast_log(LOG_NOTICE, "Alarm cleared on channel %d\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));
 		/* 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. */