db: Fix incorrect DB tree count for AMI.

The DBGetTree AMI action's ListItem previously
always reported 1, regardless of the count. This
is corrected to report the actual count.

ASTERISK-30245 #close
patches:
  gettreecount.diff submitted by Birger Harzenetter (license 5870)

Change-Id: I46d8992710f1b8524426b1255f57d1ef4a4934d4

diff --git a/main/db.c b/main/db.c
index 2ad430e73d5942b9f41979b863d693357312172c..a807fdd3bc9aacdb20d58e652b2b47d7fe920f14 100644 (file)
--- a/main/db.c
+++ b/main/db.c
@@ -999,6 +999,7 @@ static int manager_db_tree_get(struct mansession *s, const struct message *m)
        const char *family = astman_get_header(m, "Family");
        const char *key = astman_get_header(m, "Key");
        sqlite3_stmt *stmt = gettree_stmt;
+       int count = 0;
 
        if (!ast_strlen_zero(family) && !ast_strlen_zero(key)) {
                /* Family and key tree */
@@ -1044,12 +1045,13 @@ static int manager_db_tree_get(struct mansession *s, const struct message *m)
                        "%s"
                        "\r\n",
                        key_s, value_s, idText);
+               count++;
        }
 
        sqlite3_reset(stmt);
        ast_mutex_unlock(&dblock);
 
-       astman_send_list_complete_start(s, m, "DBGetTreeComplete", 1);
+       astman_send_list_complete_start(s, m, "DBGetTreeComplete", count);
        astman_send_list_complete_end(s);
 
        return 0;