chan_sip: Attempt ast_do_pickup in handle_invite_replaces

When a call pickup is performed using and invite with replaces header
the ast_do_pickup method is attempted and a PICKUP stasis message is sent.

ASTERISK-28081 #close
Reported-by: Luit van Drongelen
Change-Id: Ieb1442027a3ce6ae55faca47bc095e53972f947a

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ff4c5609eed3032f1dc8f532536617a62da3edd3..97ce93c554425196b7ced17d151bd291da3603e2 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -25684,7 +25684,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);