From: Mark Michelson <mmichelson@digium.com>
Date: Mon, 6 Apr 2015 14:51:21 +0000 (+0000)
Subject: ParkedCall: Don't allow dialplan fallthrough after retrieving parked call.
X-Git-Tag: 14.0.0-beta1~1123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53af579d4c198cd754ce7b3b3e230d511b238b6f;p=thirdparty%2Fasterisk.git

ParkedCall: Don't allow dialplan fallthrough after retrieving parked call.

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)
........

Merged revisions 434022 from http://svn.asterisk.org/svn/asterisk/branches/13


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

diff --git a/res/parking/parking_applications.c b/res/parking/parking_applications.c
index 002d60a765..22ae9c4485 100644
--- a/res/parking/parking_applications.c
+++ b/res/parking/parking_applications.c
@@ -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 {