From: Kinsey Moore <kmoore@digium.com>
Date: Wed, 5 Sep 2012 18:30:49 +0000 (+0000)
Subject: Ensure counts generated in manager_show_dialplan_helper are correct
X-Git-Tag: 10.9.0-rc1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c4f3dcec241beaff9bf2776a544a28c25b71343;p=thirdparty%2Fasterisk.git

Ensure counts generated in manager_show_dialplan_helper are correct

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


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

diff --git a/main/pbx.c b/main/pbx.c
index f24973134b..165cf22627 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -6911,6 +6911,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));
 
@@ -6934,8 +6935,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 */