[svn-commits] mjordan: trunk r422524 - in /trunk: ./ main/cli.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Mon Sep  1 10:25:26 2014
New Revision: 422524

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=422524
Log:
main/cli: Do not attempt to show CDR data for internal channels

Internal channels don't have CDRs. Querying the CDR engine for their variables
will make it cranky.
........

Merged revisions 422506 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 422507 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/main/cli.c

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

Modified: trunk/main/cli.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cli.c?view=diff&rev=422524&r1=422523&r2=422524
==============================================================================
--- trunk/main/cli.c (original)
+++ trunk/main/cli.c Mon Sep  1 10:25:26 2014
@@ -1662,7 +1662,8 @@
 		ast_str_append(&output, 0, "%s=%s\n", ast_var_name(var), ast_var_value(var));
 	}
 
-	if (ast_cdr_serialize_variables(ast_channel_name(chan), &obuf, '=', '\n')) {
+	if (!(ast_channel_tech(chan)->properties & AST_CHAN_TP_INTERNAL)
+		&& ast_cdr_serialize_variables(ast_channel_name(chan), &obuf, '=', '\n')) {
 		ast_str_append(&output, 0, "  CDR Variables:\n%s\n", ast_str_buffer(obuf));
 	}