[svn-commits] jpeeler: branch 1.6.1 r146924 - in /branches/1.6.1: ./ include/asterisk/ main...

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Mon Oct  6 18:08:51 2008
New Revision: 146924

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


........

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

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

Modified: branches/1.6.1/include/asterisk/features.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/include/asterisk/features.h?view=diff&rev=146924&r1=146923&r2=146924
==============================================================================
--- branches/1.6.1/include/asterisk/features.h (original)
+++ branches/1.6.1/include/asterisk/features.h Mon Oct  6 18:08:51 2008
@@ -32,6 +32,8 @@
 #define FEATURE_SNAME_LEN	32
 #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 */
 

Modified: branches/1.6.1/main/features.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/features.c?view=diff&rev=146924&r1=146923&r2=146924
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Mon Oct  6 18:08:51 2008
@@ -159,7 +159,7 @@
 "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";
 

Modified: branches/1.6.1/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/res/res_agi.c?view=diff&rev=146924&r1=146923&r2=146924
==============================================================================
--- branches/1.6.1/res/res_agi.c (original)
+++ branches/1.6.1/res/res_agi.c Mon Oct  6 18:08:51 2008
@@ -56,6 +56,7 @@
 #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 @@
 	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++) {