Ensure counts generated in manager_show_dialplan_helper are correct
authorKinsey Moore <kmoore@digium.com>
Wed, 5 Sep 2012 19:08:15 +0000 (19:08 +0000)
committerKinsey Moore <kmoore@digium.com>
Wed, 5 Sep 2012 19:08:15 +0000 (19:08 +0000)
When manager_show_dialplan_helper was written, the counter increment
for the total number of contexts was placed with the extensions
increment instead of in the enclosing loop.  This function should
now generate correct context counts.

(closes issue AST-970)
Reported-by: John Bigelow
........

Merged revisions 372337 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 372338 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 372340 from http://svn.asterisk.org/svn/asterisk/branches/11

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

main/pbx.c

index 1acb811..d2b2aa1 100644 (file)
@@ -7769,6 +7769,7 @@ static int manager_show_dialplan_helper(struct mansession *s, const struct messa
                        continue;       /* not the name we want */
 
                dpc->context_existence = 1;
+               dpc->total_context++;
 
                ast_debug(3, "manager_show_dialplan: Found Context: %s \n", ast_get_context_name(c));
 
@@ -7792,8 +7793,6 @@ static int manager_show_dialplan_helper(struct mansession *s, const struct messa
 
                        dpc->extension_existence = 1;
 
-                       /* may we print context info? */
-                       dpc->total_context++;
                        dpc->total_exten++;
 
                        p = NULL;               /* walk next extension peers */