[asterisk-commits] mjordan: branch 11 r381917 - in /branches/11: ./ apps/app_parkandannounce.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sun Feb 24 09:37:26 2013
New Revision: 381917

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381917
Log:
Make ParkAndAnnounce return to priority + 1 when return context is not defined

The ParkAndAnnounce application documentation for the optional return_context
parameter states the following:

return_context
    The goto-style label to jump the call back into after timeout. Default
    'priority+1'.

Unfortunately, the application was sending the channel back into the dialplan
at 'priority', which is the ParkAndAnnounce application call. This causes an
infinite loop of the channel constantly being parked, announced, timed out,
parked, announced, timed out... while fun, especially for those callers you
wish to drive to the end of madness, this was not the intent of the
application.

(closes issue ASTERISK-20113)
Reported by: serginuez
patches:
  app_parkandannounce.diff uploaded by serginuez (License 6405)
........

Merged revisions 381916 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/11/   (props changed)
    branches/11/apps/app_parkandannounce.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/11/apps/app_parkandannounce.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/apps/app_parkandannounce.c?view=diff&rev=381917&r1=381916&r2=381917
==============================================================================
--- branches/11/apps/app_parkandannounce.c (original)
+++ branches/11/apps/app_parkandannounce.c Sun Feb 24 09:37:26 2013
@@ -139,6 +139,8 @@
 	if (!ast_strlen_zero(args.return_context)) {
 		ast_clear_flag(ast_channel_flags(chan), AST_FLAG_IN_AUTOLOOP);
 		ast_parseable_goto(chan, args.return_context);
+	} else {
+		ast_channel_priority_set(chan, ast_channel_priority(chan) + 1);
 	}
 
 	ast_verb(3, "Return Context: (%s,%s,%d) ID: %s\n", ast_channel_context(chan), ast_channel_exten(chan),