sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341719 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett 2011-10-20 22:03:35 +00:00
parent 0e887d1a50
commit b961d57c4c
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/asterisk/features.h
View File

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

8
main/features.c
View File

@ -416,7 +416,7 @@ typedef enum {
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 @@ AST_DEFINE_APP_ARGS_TYPE(park_app_args,
);
/* 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 @@ static struct ast_exten *get_parking_exten(const char *exten_str, struct ast_cha
}
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 @@ static int park_call_exec(struct ast_channel *chan, const char *data)
res = 0;
} else {
/* Park succeeded. */
res = 1;
res = -1;
}
return res;

4
res/res_agi.c
View File

@ -61,7 +61,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#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 @@ static int handle_exec(struct ast_channel *chan, AGI *agi, int argc, const char
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);
}