[asterisk-commits] jpeeler: branch 1.4 r146129 - in /branches/1.4: include/asterisk/ res/

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Oct  3 15:44:22 2008
New Revision: 146129

URL: http://svn.digium.com/view/asterisk?view=rev&rev=146129
Log:
(closes issue #13425)
Reported by: mdu113
Tested by: mdu113

Similar to r143204, masquerade the channel in the case of Park being called from AGI.


Modified:
    branches/1.4/include/asterisk/features.h
    branches/1.4/res/res_agi.c
    branches/1.4/res/res_features.c

Modified: branches/1.4/include/asterisk/features.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/features.h?view=diff&rev=146129&r1=146128&r2=146129
==============================================================================
--- branches/1.4/include/asterisk/features.h (original)
+++ branches/1.4/include/asterisk/features.h Fri Oct  3 15:44:22 2008
@@ -30,6 +30,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 */
 struct ast_call_feature {

Modified: branches/1.4/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_agi.c?view=diff&rev=146129&r1=146128&r2=146129
==============================================================================
--- branches/1.4/res/res_agi.c (original)
+++ branches/1.4/res/res_agi.c Fri Oct  3 15:44:22 2008
@@ -64,6 +64,7 @@
 #include "asterisk/lock.h"
 #include "asterisk/strings.h"
 #include "asterisk/agi.h"
+#include "asterisk/features.h"
 
 #define MAX_ARGS 128
 #define MAX_COMMANDS 128
@@ -1110,6 +1111,9 @@
 	app = pbx_findapp(argv[1]);
 
 	if (app) {
+		if(!strcasecmp(argv[1], PARK_APP_NAME)) {
+			ast_masq_park_call(chan, NULL, 0, NULL);
+		}
 		res = pbx_exec(chan, app, argv[2]);
 	} else {
 		ast_log(LOG_WARNING, "Could not find application (%s)\n", argv[1]);
@@ -2035,7 +2039,7 @@
 	int fds[2];
 	int efd = -1;
 	int pid;
-        char *stringp;
+	char *stringp;
 	AGI agi;
 
 	if (ast_strlen_zero(data)) {

Modified: branches/1.4/res/res_features.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_features.c?view=diff&rev=146129&r1=146128&r2=146129
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Fri Oct  3 15:44:22 2008
@@ -118,7 +118,7 @@
 "into the dialplan, although you should include the 'parkedcalls'\n"
 "context.\n";
 
-static char *parkcall = "Park";
+static char *parkcall = PARK_APP_NAME;
 
 static char *synopsis2 = "Park yourself";
 
@@ -565,7 +565,7 @@
 static int builtin_parkcall(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config, char *code, int sense, void *data)
 {
 	struct ast_channel *parker;
-        struct ast_channel *parkee;
+	struct ast_channel *parkee;
 	int res = 0;
 	struct ast_module_user *u;