[asterisk-commits] qwell: trunk r393508 - in /trunk: CHANGES main/manager.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Jul  2 17:01:23 2013
New Revision: 393508

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=393508
Log:
Add a SystemName field to all AMI events.

This only gets sent out if configured in asterisk.conf

(closes issue ASTERISK-21494)

Modified:
    trunk/CHANGES
    trunk/main/manager.c

Modified: trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=393508&r1=393507&r2=393508
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Tue Jul  2 17:01:23 2013
@@ -196,8 +196,8 @@
    event, the various ChanVariable fields will contain a suffix that specifies
    which channel they correspond to.
 
-* The NewPeerAccount AMI event is no longer raised. The NewAccountCode AMI
-  event always conveys the AMI event for a particular channel.
+ * The NewPeerAccount AMI event is no longer raised. The NewAccountCode AMI
+   event always conveys the AMI event for a particular channel.
 
  * All "Reload" events have been consolidated into a single event type. This
    event will always contain a Module field specifying the name of the module
@@ -251,6 +251,8 @@
    renamed "DAHDIChannel" since it does not convey an Asterisk channel name.
 
  * "ChannelUpdate" events have been removed.
+
+ * AMI events now contain a SystemName field, if available.
 
 AGI (Asterisk Gateway Interface)
 ------------------

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=393508&r1=393507&r2=393508
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Tue Jul  2 17:01:23 2013
@@ -5962,6 +5962,11 @@
 		ast_str_append(&buf, 0,
 				"File: %s\r\nLine: %d\r\nFunc: %s\r\n", file, line, func);
 	}
+	if (!ast_strlen_zero(ast_config_AST_SYSTEM_NAME)) {
+		ast_str_append(&buf, 0,
+				"SystemName: %s\r\n",
+				 ast_config_AST_SYSTEM_NAME);
+	}
 
 	va_start(ap, fmt);
 	ast_str_append_va(&buf, 0, fmt, ap);