]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
ParkedCall: Don't allow dialplan fallthrough after retrieving parked call.
authorMark Michelson <mmichelson@digium.com>
Mon, 6 Apr 2015 14:50:53 +0000 (14:50 +0000)
committerMark Michelson <mmichelson@digium.com>
Mon, 6 Apr 2015 14:50:53 +0000 (14:50 +0000)
This is a change to align behavior with that of Asterisk 11 and previous versions.
In those versions, if a parked call were retrieved, and the call ended, the parked
call retriever would be hung up after the ParkedCall application ran. Prior to this
patch, in Asterisk 13, the same situation would result in the parked call retriever
falling through to additional priorities in the extension where the ParkedCall
application was called. With this patch, the behavior between Asterisk 11 and 13
aligns.

ASTERISK-24899 #close
Reported by Malcolm Davenport
Patches:
ASTERISK-24899.patch uploaded by Mark Michelson(license #5049)

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

res/parking/parking_applications.c

index 002d60a765544ea813dd20d707385743da8e5b83..22ae9c4485e09e6152658a0f38abde76e24e8611 100644 (file)
@@ -647,7 +647,10 @@ static int parked_call_app_exec(struct ast_channel *chan, const char *data)
 
        ast_bridge_features_cleanup(&chan_features);
 
-       return 0;
+       /* Return -1 so that call does not continue in the dialplan. This is to make
+        * behavior consistent with Asterisk versions prior to 12.
+        */
+       return -1;
 }
 
 struct park_announce_subscription_data {