]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
manager.c: Fix FRACK when doing CoreShowChannelMap in DEVMODE
authorGeorge Joseph <gjoseph@sangoma.com>
Thu, 8 Aug 2024 16:57:14 +0000 (10:57 -0600)
committerAsterisk Development Team <asteriskteam@digium.com>
Thu, 12 Sep 2024 18:46:27 +0000 (18:46 +0000)
If you run an AMI CoreShowChannelMap on a channel that isn't in a
bridge and you're in DEVMODE, you can get a FRACK because the
bridge id is empty.  We now simply return an empty list for that
request.

(cherry picked from commit 63004f2c02a9331c2406da15d8e547b0b8b7cd69)

main/manager.c

index 2ce88a3ab8d1c746d4f9393467025233ecc92137..a9bc52e5fdab7cfb93cd198d3ebd147121fa632c 100644 (file)
@@ -7313,6 +7313,13 @@ static int action_coreshowchannelmap(struct mansession *s, const struct message
                return 0;
        }
 
+       if (ast_strlen_zero(channel_snapshot->bridge->id)) {
+               astman_send_listack(s, m, "Channel map will follow", "start");
+               astman_send_list_complete_start(s, m, "CoreShowChannelMapComplete", 0);
+               astman_send_list_complete_end(s);
+               return 0;
+       }
+
        bridge_snapshot = ast_bridge_get_snapshot_by_uniqueid(channel_snapshot->bridge->id);
        if (!bridge_snapshot) {
                astman_send_listack(s, m, "Channel map will follow", "start");