Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv3835/apps
Modified Files:
app_chanisavail.c
Log Message:
issue #5598
Index: app_chanisavail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_chanisavail.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- app_chanisavail.c 6 Nov 2005 15:09:46 -0000 1.27
+++ app_chanisavail.c 6 Nov 2005 18:11:13 -0000 1.28
@@ -42,6 +42,7 @@
#include "asterisk/module.h"
#include "asterisk/app.h"
#include "asterisk/devicestate.h"
+#include "asterisk/options.h"
static char *tdesc = "Check if channel is available";
@@ -51,17 +52,16 @@
static char *descrip =
" ChanIsAvail(Technology/resource[&Technology2/resource2...][|option]): \n"
-"Checks is any of the requested channels are available. If none\n"
-"of the requested channels are available the new priority will be\n"
-"n+101 (unless such a priority does not exist or on error, in which\n"
-"case ChanIsAvail will return -1).\n"
+"Checks is any of the requested channels are available. \n"
"If any of the requested channels are available, the next priority will be
n+1,\n"
"the channel variable ${AVAILCHAN} will be set to the name of the available
channel\n"
"and the ChanIsAvail app will return 0.\n"
"${AVAILORIGCHAN} is the canonical channel name that was used to create the
channel.\n"
"${AVAILSTATUS} is the status code for the channel.\n"
"If the option 's' is specified (state), will consider channel unavailable\n"
-"when the channel is in use at all, even if it can take another call.\n";
+"when the channel is in use at all, even if it can take another call.\n"
+"If the option 'j' is specified (jump), the application will jump to n+101 \n"
+"(unless such a priority does not exist, in which case ChanIsAvail will return
-1)\n";
STANDARD_LOCAL_USER;
@@ -69,7 +69,7 @@
static int chanavail_exec(struct ast_channel *chan, void *data)
{
- int res=-1, inuse=-1, option_state=0;
+ int res=-1, inuse=-1, option_state=0, priority_jump=0;
int status;
struct localuser *u;
char *info, tmp[512], trychan[512], *peers, *tech, *number, *rest,
*cur, *options, *stringp;
@@ -86,8 +86,12 @@
stringp = info;
strsep(&stringp, "|");
options = strsep(&stringp, "|");
- if (options && *options == 's')
- option_state = 1;
+ if (options) {
+ if (strchr(options, 's'))
+ option_state = 1;
+ if (strchr(options, 'j'))
+ priority_jump = 1;
+ }
peers = info;
if (peers) {
cur = peers;
@@ -137,9 +141,11 @@
if (res < 1) {
pbx_builtin_setvar_helper(chan, "AVAILCHAN", "");
pbx_builtin_setvar_helper(chan, "AVAILORIGCHAN", "");
- if (ast_goto_if_exists(chan, chan->context, chan->exten,
chan->priority + 101)) {
- LOCAL_USER_REMOVE(u);
- return -1;
+ if (priority_jump || option_priority_jumping) {
+ if (ast_goto_if_exists(chan, chan->context,
chan->exten, chan->priority + 101)) {
+ LOCAL_USER_REMOVE(u);
+ return -1;
+ }
}
}
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
