kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 10:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 251679 via svnmerge from

Browse Source 
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
This commit is contained in:
Jeff Peeler
2010-03-10 20:59:01 +00:00
parent b30672ece0
commit e611ddefe6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/features.c
View File

@@ -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);