[asterisk-commits] jpeeler: branch 1.6.1 r251684 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Mar 10 14:59:01 2010
New Revision: 251684

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=251684
Log:
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/
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/features.c?view=diff&rev=251684&r1=251683&r2=251684
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Wed Mar 10 14:59:01 2010
@@ -502,6 +502,8 @@
 	
 	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 @@
 	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);