From: Jeff Peeler <jpeeler@digium.com>
Date: Wed, 10 Mar 2010 20:59:01 +0000 (+0000)
Subject: Merged revisions 251679 via svnmerge from
X-Git-Tag: 1.6.1.19-rc1~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e611ddefe6e025b5c52316b5ef89f756ac57c836;p=thirdparty%2Fasterisk.git

Merged revisions 251679 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r251679 | jpeeler | 2010-03-10 14:51:23 -0600 (Wed, 10 Mar 2010) | 13 lines

  Fix ParkAndAnnounce not respecting parking options.

  The patch ensures that if a peer does not exist, parking settings are read from
  the channel. A unit test has been written to ensure proper operation for both
  standard parking and parking using masquerades.

  (closes issue #16592)
  Reported by: mwyres
  Patches:
        bug_16592.diff uploaded by snuffy (license 35)

  Review: https://reviewboard.asterisk.org/r/539/
........


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

diff --git a/main/features.c b/main/features.c
index ab376f9c72..f48982c6b9 100644
--- a/main/features.c
+++ b/main/features.c
@@ -502,6 +502,8 @@ static struct parkeduser *park_space_reserve(struct ast_channel *chan,
 	
 	if (peer)
 		parkinglotname = findparkinglotname(peer);
+	else /* peer was NULL, check chan (ParkAndAnnounce / res_agi) */
+		parkinglotname = findparkinglotname(chan);
 
 	if (parkinglotname) {
 		if (option_debug)
@@ -818,7 +820,7 @@ static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, i
 	return 0;
 }
 
-/* Park call via masquraded channel */
+/* Park call via masqueraded channel */
 int ast_masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, int timeout, int *extout)
 {
 	return masq_park_call(rchan, peer, timeout, extout, 0, NULL);