From d83eec795fb46692424d4c4d7dee35dfc590c6a0 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 19 May 2005 02:57:45 +0000 Subject: [PATCH] support labels as targets of SET PRIORITY command (bug #4057) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5727 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_agi.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/res/res_agi.c b/res/res_agi.c index b417dd8ca2..7f58d65939 100755 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -756,9 +756,13 @@ static int handle_setpriority(struct ast_channel *chan, AGI *agi, int argc, char int pri; if (argc != 3) return RESULT_SHOWUSAGE; - if (sscanf(argv[2], "%d", &pri) != 1) - return RESULT_SHOWUSAGE; - chan->priority = pri - 1; + + if (sscanf(argv[2], "%d", &pri) != 1) { + if ((pri = ast_findlabel_extension(chan, chan->context, chan->exten, argv[2], chan->cid.cid_num)) < 1) + return RESULT_SHOWUSAGE; + } + + ast_explicit_goto(chan, NULL, NULL, pri); fdprintf(agi->fd, "200 result=0\n"); return RESULT_SUCCESS; } @@ -1458,8 +1462,9 @@ static char usage_setextension[] = " Changes the extension for continuation upon exiting the application.\n"; static char usage_setpriority[] = -" Usage: SET PRIORITY \n" -" Changes the priority for continuation upon exiting the application.\n"; +" Usage: SET PRIORITY \n" +" Changes the priority for continuation upon exiting the application.\n" +" The priority must be a valid priority or label.\n"; static char usage_recordfile[] = " Usage: RECORD FILE \\\n"