From 595d37e746e7a1afe66d1598aed0a0260a5e0ff8 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Mon, 6 Oct 2008 23:08:51 +0000 Subject: [PATCH] Merged revisions 146923 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r146923 | jpeeler | 2008-10-06 18:08:21 -0500 (Mon, 06 Oct 2008) | 3 lines Similar to r143204, masquerade the channel in the case of Park being called from AGI. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@146924 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/features.h | 2 ++ main/features.c | 2 +- res/res_agi.c | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/asterisk/features.h b/include/asterisk/features.h index ac745101d7..723373f94b 100644 --- a/include/asterisk/features.h +++ b/include/asterisk/features.h @@ -33,6 +33,8 @@ #define FEATURE_EXTEN_LEN 32 #define FEATURE_MOH_LEN 80 /* same as MAX_MUSICCLASS from channel.h */ +#define PARK_APP_NAME "Park" + /*! \brief main call feature structure */ enum { diff --git a/main/features.c b/main/features.c index c821986502..034b4825a5 100644 --- a/main/features.c +++ b/main/features.c @@ -159,7 +159,7 @@ static char *descrip = "ParkedCall(exten): " "context. If no extension is provided, then the first available\n" "parked call will be acquired.\n"; -static char *parkcall = "Park"; +static char *parkcall = PARK_APP_NAME; static char *synopsis2 = "Park yourself"; diff --git a/res/res_agi.c b/res/res_agi.c index 02b666c385..56cb5ebe1f 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -56,6 +56,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/ast_version.h" #include "asterisk/speech.h" #include "asterisk/manager.h" +#include "asterisk/features.h" #define MAX_ARGS 128 #define AGI_NANDFS_RETRY 3 @@ -1457,6 +1458,9 @@ static int handle_exec(struct ast_channel *chan, AGI *agi, int argc, char **argv ast_verb(3, "AGI Script Executing Application: (%s) Options: (%s)\n", argv[1], 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 (ast_compat_res_agi && !ast_strlen_zero(argv[2])) { char *compat = alloca(strlen(argv[2]) * 2 + 1), *cptr, *vptr; for (cptr = compat, vptr = argv[2]; *vptr; vptr++) {