dect/asterisk
Archived
14
0
Fork 0
Code Releases Activity

Fix big flagification errors (bug #3414)

Browse source 
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4960 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2005-02-04 05:36:27 +00:00
parent 5322cb028b
commit 4a30398119
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/app_queue.c
View file

@ -1067,7 +1067,7 @@ static struct localuser *wait_for_answer(struct queue_ent *qe, struct localuser
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "%s answered %s\n", o->chan->name, in->name); ast_verbose( VERBOSE_PREFIX_3 "%s answered %s\n", o->chan->name, in->name);
peer = o; peer = o;
ast_copy_flags(flags, o, QUEUE_FLAG_REDIR_IN & QUEUE_FLAG_REDIR_OUT & QUEUE_FLAG_DISCON_IN & QUEUE_FLAG_DISCON_OUT); ast_copy_flags(flags, o, QUEUE_FLAG_REDIR_IN | QUEUE_FLAG_REDIR_OUT | QUEUE_FLAG_DISCON_IN | QUEUE_FLAG_DISCON_OUT);
} }
} else if (o->chan && (o->chan == winner)) { } else if (o->chan && (o->chan == winner)) {
if (!ast_strlen_zero(o->chan->call_forward)) { if (!ast_strlen_zero(o->chan->call_forward)) {
@ -1367,7 +1367,7 @@ static int calc_metric(struct ast_call_queue *q, struct member *mem, int pos, st
return 0; return 0;
} }
static int try_calling(struct queue_ent *qe, char *options, char *announceoverride, char *url, int *go_on) static int try_calling(struct queue_ent *qe, char *ooptions, char *announceoverride, char *url, int *go_on)
{ {
struct member *cur; struct member *cur;
struct localuser *outgoing=NULL, *tmp = NULL; struct localuser *outgoing=NULL, *tmp = NULL;
@ -1378,6 +1378,7 @@ static int try_calling(struct queue_ent *qe, char *options, char *announceoverri
char oldcontext[AST_MAX_EXTENSION]=""; char oldcontext[AST_MAX_EXTENSION]="";
char queuename[256]=""; char queuename[256]="";
char *newnum; char *newnum;
char *options;
char *monitorfilename; char *monitorfilename;
struct ast_channel *peer; struct ast_channel *peer;
struct ast_channel *which; struct ast_channel *which;
@ -1414,6 +1415,7 @@ static int try_calling(struct queue_ent *qe, char *options, char *announceoverri
} }
memset(tmp, 0, sizeof(struct localuser)); memset(tmp, 0, sizeof(struct localuser));
tmp->stillgoing = -1; tmp->stillgoing = -1;
options = ooptions;
for (; options && *options; options++) for (; options && *options; options++)
switch (*options) { switch (*options) {
case 't': case 't':
@ -1621,6 +1623,7 @@ static int try_calling(struct queue_ent *qe, char *options, char *announceoverri
time(&callstart); time(&callstart);
memset(&config,0,sizeof(struct ast_bridge_config)); memset(&config,0,sizeof(struct ast_bridge_config));
if (ast_test_flag(&flags, QUEUE_FLAG_REDIR_IN)) if (ast_test_flag(&flags, QUEUE_FLAG_REDIR_IN))
ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT); ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT);
if (ast_test_flag(&flags, QUEUE_FLAG_REDIR_OUT)) if (ast_test_flag(&flags, QUEUE_FLAG_REDIR_OUT))