kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

More RSW merges. Everything from apps/ except for the big offenders

Browse Source 
app_voicemail and app_queue.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-10 14:45:25 +00:00
parent 357bf3e90b
commit 3ffb39833b
18 changed files with 211 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/app_dial.c
View File

@@ -2018,7 +2018,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
{
char *parse;
const char *context = NULL;
int sleep = 0, loops = 0, res = -1;
int sleepms = 0, loops = 0, res = -1;
struct ast_flags64 peerflags = { 0, };
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(announce);
@@ -2035,8 +2035,8 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
parse = ast_strdupa(data);
AST_STANDARD_APP_ARGS(args, parse);
if ((sleep = atoi(args.sleep)))
sleep *= 1000;
if ((sleepms = atoi(args.sleep)))
sleepms *= 1000;
loops = atoi(args.retries);
@@ -2045,8 +2045,8 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
goto done;
}
if (sleep < 1000)
sleep = 10000;
if (sleepms < 1000)
sleepms = 10000;
if (!loops)
loops = -1; /* run forever */
@@ -2077,10 +2077,10 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
} else
ast_log(LOG_WARNING, "Announce file \"%s\" specified in Retrydial does not exist\n", args.announce);
}
if (!res && sleep) {
if (!res && sleepms) {
if (!ast_test_flag(chan, AST_FLAG_MOH))
ast_moh_start(chan, NULL, NULL);
res = ast_waitfordigit(chan, sleep);
res = ast_waitfordigit(chan, sleepms);
}
} else {
if (!ast_strlen_zero(args.announce)) {
@@ -2090,11 +2090,11 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
} else
ast_log(LOG_WARNING, "Announce file \"%s\" specified in Retrydial does not exist\n", args.announce);
}
if (sleep) {
if (sleepms) {
if (!ast_test_flag(chan, AST_FLAG_MOH))
ast_moh_start(chan, NULL, NULL);
if (!res)
res = ast_waitfordigit(chan, sleep);
res = ast_waitfordigit(chan, sleepms);
}
}
}