[asterisk-commits] rmudgett: trunk r341719 - in /trunk: ./ include/asterisk/ main/ res/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Oct 20 17:03:35 2011
New Revision: 341719

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=341719
Log:
Fix AGI exec Park to honor the Park application parameters.

The fix for ASTERISK-12715 and ASTERISK-12685 added a check for the Park
application because the channel needed to be masqueraded to prevent a
crash.  Since the Park application now always masquerades the channel into
the parking lot, the special check is no longer needed.  The fix also
resulted in AGI exec Park attempting to double park the call and not honor
the Park application parameters.

* Removed no longer necessary call to ast_masq_park_call() by AGI exec for
the Park application.  (Reverts -r146923)

* Fix Park application to only return 0 or -1.  The AGI exec Park was
causing broken pipe error messages because the Park application returned 1
on successful park.

(closes issue ASTERISK-18737)
........

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

Merged revisions 341718 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/features.h
    trunk/main/features.c
    trunk/res/res_agi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/include/asterisk/features.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/features.h?view=diff&rev=341719&r1=341718&r2=341719
==============================================================================
--- trunk/include/asterisk/features.h (original)
+++ trunk/include/asterisk/features.h Thu Oct 20 17:03:35 2011
@@ -34,7 +34,6 @@
 #define FEATURE_EXTEN_LEN	32
 #define FEATURE_MOH_LEN		80  /* same as MAX_MUSICCLASS from channel.h */
 
-#define PARK_APP_NAME "Park"
 #define DEFAULT_PARKINGLOT "default"	/*!< Default parking lot */
 
 #define AST_FEATURE_RETURN_HANGUP           -1

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=341719&r1=341718&r2=341719
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Thu Oct 20 17:03:35 2011
@@ -416,7 +416,7 @@
 	FEATURE_INTERPRET_CHECK,  /* Used by feature_check */
 } feature_interpret_op;
 
-static char *parkedcall = "ParkedCall";
+static const char *parkedcall = "ParkedCall";
 
 static char pickup_ext[AST_MAX_EXTENSION];                 /*!< Call pickup extension */
 
@@ -630,7 +630,7 @@
 	);
 
 /* module and CLI command definitions */
-static char *parkcall = PARK_APP_NAME;
+static const char *parkcall = "Park";
 
 static struct ast_app *monitor_app = NULL;
 static int monitor_ok = 1;
@@ -783,7 +783,7 @@
 	}
 
 	app_at_exten = ast_get_extension_app(exten);
-	if (!app_at_exten || strcasecmp(PARK_APP_NAME, app_at_exten)) {
+	if (!app_at_exten || strcasecmp(parkcall, app_at_exten)) {
 		return NULL;
 	}
 
@@ -4968,7 +4968,7 @@
 		res = 0;
 	} else {
 		/* Park succeeded. */
-		res = 1;
+		res = -1;
 	}
 
 	return res;

Modified: trunk/res/res_agi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_agi.c?view=diff&rev=341719&r1=341718&r2=341719
==============================================================================
--- trunk/res/res_agi.c (original)
+++ trunk/res/res_agi.c Thu Oct 20 17:03:35 2011
@@ -61,7 +61,6 @@
 #include "asterisk/ast_version.h"
 #include "asterisk/speech.h"
 #include "asterisk/manager.h"
-#include "asterisk/features.h"
 #include "asterisk/term.h"
 #include "asterisk/xmldoc.h"
 #include "asterisk/srv.h"
@@ -2480,9 +2479,6 @@
 	ast_verb(3, "AGI Script Executing Application: (%s) Options: (%s)\n", argv[1], argc >= 3 ? argv[2] : "");
 
 	if ((app_to_exec = pbx_findapp(argv[1]))) {
-		if(!strcasecmp(argv[1], PARK_APP_NAME)) {
-			ast_masq_park_call(chan, NULL, 0, NULL);
-		}
 		if (!(workaround = ast_test_flag(chan, AST_FLAG_DISABLE_WORKAROUNDS))) {
 			ast_set_flag(chan, AST_FLAG_DISABLE_WORKAROUNDS);
 		}