]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
parking: Fall back to parker channel name even if it matches parkee.
authorJoshua Colp <jcolp@digium.com>
Mon, 25 Nov 2019 12:55:27 +0000 (12:55 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 25 Nov 2019 12:56:51 +0000 (12:56 +0000)
ASTERISK-28631

Change-Id: Ia74d084799fbb9bee3403e30d2391aacd46243cc

res/parking/parking_bridge.c

index b92a44b249712c40e526edef25b06d8f97f4f85f..0a46d79b5ebbed603b88a7896174cc7c785f7a09 100644 (file)
@@ -274,10 +274,15 @@ static int bridge_parking_push(struct ast_bridge_parking *self, struct ast_bridg
        blind_transfer = ast_strdupa(S_OR(blind_transfer, ""));
        ast_channel_unlock(bridge_channel->chan);
        if (!parker || !strcmp(parker->base->name, ast_channel_name(bridge_channel->chan))) {
-               /* Even if there is no BLINDTRANSFER dialplan variable then blind_transfer will
-                * be an empty string.
-                */
-               parker_channel_name = blind_transfer;
+               if (ast_strlen_zero(blind_transfer) && parker) {
+                       /* If no BLINDTRANSFER exists but the parker does then use their channel name */
+                       parker_channel_name = parker->base->name;
+               } else {
+                       /* Even if there is no BLINDTRANSFER dialplan variable then blind_transfer will
+                        * be an empty string.
+                        */
+                       parker_channel_name = blind_transfer;
+               }
        } else {
                parker_channel_name = parker->base->name;
        }