Fix skinny encall button to not blind xfer.

The softbutton endcall should not turn a transfer into a blind transfer but
hangup the exten being called and leave the original call on hold. This does
that.

(closes issue ASTERISK-21321)
Reported by: wedhorn
Tested by: snuffy, myself
Patches:
    skinny-xferendcall01.diff uploaded by wedhorn (license 5019)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@383948 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 6db4bce5445249435d0e9afdf0b1ea9de5fa93e9..17790f61b02ab3f7c25e9514c362f9c461bb384c 100644 (file)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -7114,13 +7114,6 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                SKINNY_DEBUG(DEBUG_PACKET, 3, "Received SOFTKEY_ENDCALL from %s, inst %d, callref %d\n",
                        d->name, instance, callreference);
 
-               if (l->transfer && sub && sub->xferor && ast_channel_state(sub->owner) >= AST_STATE_RING) {
-                       /* We're allowed to transfer, we have two active calls and
-                           we made at least one of the calls.  Let's try and transfer */
-                       handle_transfer_button(sub);
-                       return 0;
-               }
-
                ast_devstate_changed(AST_DEVICE_NOT_INUSE, AST_DEVSTATE_CACHABLE, "Skinny/%s", l->name);
 
                if (sub) {