Change cdr_manager to use a "CDR" level, rather than the (overcrowded) "call" level.

(Closes issue #11015)

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

diff --git a/CHANGES b/CHANGES
index 34ca72d21c30a96452d8fcb2516582ad234157c3..3380c62ccbf957345dd3d86487a199919ad87830 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,8 @@ AMI - The manager (TCP/TLS/HTTP)
   * Added a "ListAllVoicemailUsers" action that allows you to get a list of all
      the voicemail users setup.
   * Added 'DBDel' and 'DBDelTree' manager commands.
+  * cdr_manager now reports events via the "cdr" level, separating it from
+     the very verbose "call" level.
 
 Dialplan functions
 ------------------

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 82374eb59f69b267d7a9992c2da097862e38d142..06828c68345e26d83cc2faf384053907833e8cab 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -146,3 +146,7 @@ Manager:
 * The IAXpeers command output has been changed to more closely resemble the
   output of the SIPpeers command.
 
+* cdr_manager now reports at the "cdr" level, not at "call"  You may need to
+   change your manager.conf to add the level to existing AMI users, if they
+   want to see the CDR events generated.
+

diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c
index b6f5deb6a4ebacd8bb2d477f6e8f21f2e3613df1..8b2ab215d4d180c13a10db2a6e52520d1646ea10 100644 (file)
--- a/cdr/cdr_manager.c
+++ b/cdr/cdr_manager.c
@@ -146,7 +146,7 @@ static int manager_log(struct ast_cdr *cdr)
                pbx_substitute_variables_helper(&dummy, customfields->str, buf, sizeof(buf) - 1);
        }
 
-       manager_event(EVENT_FLAG_CALL, "Cdr",
+       manager_event(EVENT_FLAG_CDR, "Cdr",
            "AccountCode: %s\r\n"
            "Source: %s\r\n"
            "Destination: %s\r\n"

diff --git a/configs/manager.conf.sample b/configs/manager.conf.sample
index dceec13788dbf7bdf339673c6532618a9bdc19ea..b4d6a0909e1f02430a3d8c0730cc7898be1f9108 100644 (file)
--- a/configs/manager.conf.sample
+++ b/configs/manager.conf.sample
@@ -71,5 +71,5 @@ bindaddr = 0.0.0.0
 ;displayconnects = yes ; Display on CLI user login/logoff
 ;
 ; Authorization for various classes 
-;read = system,call,log,verbose,command,agent,user,config,dtmf,reporting
-;write = system,call,log,verbose,command,agent,user,config,dtmf,reporting
+;read = system,call,log,verbose,command,agent,user,config,dtmf,reporting,cdr
+;write = system,call,log,verbose,command,agent,user,config,dtmf,reporting,cdr

diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h
index 79a1998d0993e1f40a7a5edc42f0701a68bd66a5..a57e890fd4fc929881766383ade19e2537d2d54d 100644 (file)
--- a/include/asterisk/manager.h
+++ b/include/asterisk/manager.h
@@ -63,6 +63,8 @@
 #define EVENT_FLAG_CONFIG              (1 << 7) /* Ability to modify configurations */
 #define EVENT_FLAG_DTMF                (1 << 8) /* Ability to read DTMF events */
 #define EVENT_FLAG_REPORTING           (1 << 9) /* Reporting events such as rtcp sent */
+#define EVENT_FLAG_CDR                 (1 << 10) /* CDR events */
+
 /* Export manager structures */
 #define AST_MAX_MANHEADERS 128
 

diff --git a/main/manager.c b/main/manager.c
index 6b3bf700b7b88f2a0fd9fa507d76bcca906dd3ad..4c2a340b7d1de9033fd629c0ee2cf156c00e26fb 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -309,6 +309,7 @@ static struct permalias {
        { EVENT_FLAG_CONFIG, "config" },
        { EVENT_FLAG_DTMF, "dtmf" },
        { EVENT_FLAG_REPORTING, "reporting" },
+       { EVENT_FLAG_CDR, "cdr" },
        { -1, "all" },
        { 0, "none" },
 };