From 7335b0cffe6c997eb66de249fd90c7463abd5828 Mon Sep 17 00:00:00 2001 From: Naveen Albert Date: Sat, 24 Sep 2022 12:08:14 +0000 Subject: [PATCH] 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 --- main/db.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main/db.c b/main/db.c index 2ad430e73d..a807fdd3bc 100644 --- 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;