Index: apps/app_transfer.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_transfer.c,v
retrieving revision 1.19
diff -u -r1.19 app_transfer.c
--- apps/app_transfer.c	6 Nov 2005 15:09:46 -0000	1.19
+++ apps/app_transfer.c	7 Nov 2005 20:18:03 -0000
@@ -40,6 +40,7 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
+#include "asterisk/app.h"
 
 STANDARD_LOCAL_USER;
 
@@ -52,7 +53,7 @@
 static const char *synopsis = "Transfer caller to remote extension";
 
 static const char *descrip = 
-"  Transfer([Tech/]dest):  Requests the remote caller be transfered\n"
+"  Transfer([Tech/]dest[|options]):  Requests the remote caller be transfered\n"
 "to a given extension. If TECH (SIP, IAX2, LOCAL etc) is used, only\n"
 "an incoming call with the same channel technology will be transfered.\n"
 "Note that for SIP, if you transfer before call is setup, a 302 redirect\n"
@@ -62,11 +63,11 @@
 "       SUCCESS       Transfer succeeded\n"
 "       FAILURE      Transfer failed\n"
 "       UNSUPPORTED  Transfer unsupported by channel driver\n"
+"The option string many contain zero or the following character:\n"
+"'j' -- jump to n+101 priority if the channel transfer attempt\n"
+"       fails\n"
 "Returns -1 on hangup, or 0 on completion regardless of whether the\n"
-"transfer was successful.\n\n"
-"Old depraciated behaviour: If the transfer was *not* supported or\n"
-"successful and there exists a priority n + 101,\n"
-"then that priority will be taken next.\n" ;
+"transfer was successful.\n\n";
 
 static int transfer_exec(struct ast_channel *chan, void *data)
 {
@@ -75,16 +76,39 @@
 	struct localuser *u;
 	char *slash;
 	char *tech = NULL;
-	char *dest = data;
+	char *dest = NULL;
 	char *status;
+	char *parse;
+	int priority_jump = 0;
+	AST_DECLARE_APP_ARGS(args,
+		AST_APP_ARG(dest);
+		AST_APP_ARG(options);
+	);
 
-	if (ast_strlen_zero(dest)) {
-		ast_log(LOG_WARNING, "Transfer requires an argument ([Tech/]destination)\n");
+	LOCAL_USER_ADD(u);
+
+	if (ast_strlen_zero((char *)data)) {
+		ast_log(LOG_WARNING, "Transfer requires an argument ([Tech/]destination[|options])\n");
+		LOCAL_USER_REMOVE(u);
 		pbx_builtin_setvar_helper(chan, "TRANSFERSTATUS", "FAILURE");
 		return 0;
+	} else {
+		parse = ast_strdupa(data);
+		if (!parse) {
+			ast_log(LOG_ERROR, "Out of memory!\n");
+			LOCAL_USER_REMOVE(u);
+			return -1;
+		}
 	}
 
-	LOCAL_USER_ADD(u);
+	AST_STANDARD_APP_ARGS(args, parse);
+
+	if (args.options) {
+		if (strchr(args.options, 'j'))
+			priority_jump = 1;
+	}
+
+	dest = args.dest;
 
 	if ((slash = strchr(dest, '/')) && (len = (slash - dest))) {
 		tech = dest;
@@ -108,7 +132,7 @@
 
 	if (res < 0) {
 		status = "FAILURE";
-		if (option_priority_jumping)
+		if (priority_jump || option_priority_jumping)
 			ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101);
 		res = 0;
 	} else {