Merge "chan_sip: Attempt ast_do_pickup in handle_invite_replaces"
authorGeorge Joseph <gjoseph@digium.com>
Mon, 5 Nov 2018 15:32:55 +0000 (09:32 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 5 Nov 2018 15:32:55 +0000 (09:32 -0600)
channels/chan_sip.c

index 3aae905..55da37d 100644 (file)
@@ -25903,7 +25903,13 @@ static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req,
                }
                ao2_ref(bridge, -1);
        } else {
-               ast_channel_move(replaces_chan, c);
+               int pickedup;
+               ast_channel_lock(replaces_chan);
+               pickedup = ast_can_pickup(replaces_chan) && !ast_do_pickup(c, replaces_chan);
+               ast_channel_unlock(replaces_chan);
+               if (!pickedup) {
+                       ast_channel_move(replaces_chan, c);
+               }
                ast_hangup(c);
        }
        ast_channel_unref(c);