kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-22 21:36:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update queue to use ast_flags (bug #3108)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-12-20 16:20:38 +00:00
parent a0af83a9c4
commit e6db9fa895
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/app_queue.c
View File

@@ -892,7 +892,7 @@ static int valid_exit(struct queue_ent *qe, char digit)
#define AST_MAX_WATCHERS 256 #define AST_MAX_WATCHERS 256
static struct localuser *wait_for_answer(struct queue_ent *qe, struct localuser *outgoing, int *to, struct localuser *flags, char *digit) static struct localuser *wait_for_answer(struct queue_ent *qe, struct localuser *outgoing, int *to, struct ast_flags *flags, char *digit)
{ {
char *queue = qe->parent->name; char *queue = qe->parent->name;
struct localuser *o; struct localuser *o;
@@ -1247,7 +1247,7 @@ static int try_calling(struct queue_ent *qe, char *options, char *announceoverri
struct member *cur; struct member *cur;
struct localuser *outgoing=NULL, *tmp = NULL; struct localuser *outgoing=NULL, *tmp = NULL;
int to; int to;
struct localuser flags_dummy; struct ast_flags flags;
char restofit[AST_MAX_EXTENSION]; char restofit[AST_MAX_EXTENSION];
char oldexten[AST_MAX_EXTENSION]=""; char oldexten[AST_MAX_EXTENSION]="";
char oldcontext[AST_MAX_EXTENSION]=""; char oldcontext[AST_MAX_EXTENSION]="";
@@ -1354,7 +1354,7 @@ static int try_calling(struct queue_ent *qe, char *options, char *announceoverri
to = -1; to = -1;
ring_one(qe, outgoing); ring_one(qe, outgoing);
ast_mutex_unlock(&qe->parent->lock); ast_mutex_unlock(&qe->parent->lock);
lpeer = wait_for_answer(qe, outgoing, &to, &flags_dummy, &digit); lpeer = wait_for_answer(qe, outgoing, &to, &flags, &digit);
ast_mutex_lock(&qe->parent->lock); ast_mutex_lock(&qe->parent->lock);
if (qe->parent->strategy == QUEUE_STRATEGY_RRMEMORY) { if (qe->parent->strategy == QUEUE_STRATEGY_RRMEMORY) {
store_next(qe, outgoing); store_next(qe, outgoing);
@@ -1473,10 +1473,10 @@ 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));
config.allowredirect_in = ast_test_flag(&flags_dummy, QUEUE_FLAG_REDIR_IN); config.allowredirect_in = ast_test_flag(&flags, QUEUE_FLAG_REDIR_IN);
config.allowredirect_out = ast_test_flag(&flags_dummy, QUEUE_FLAG_REDIR_OUT); config.allowredirect_out = ast_test_flag(&flags, QUEUE_FLAG_REDIR_OUT);
config.allowdisconnect_in = ast_test_flag(&flags_dummy, QUEUE_FLAG_DISCON_IN); config.allowdisconnect_in = ast_test_flag(&flags, QUEUE_FLAG_DISCON_IN);
config.allowdisconnect_out = ast_test_flag(&flags_dummy, QUEUE_FLAG_DISCON_OUT); config.allowdisconnect_out = ast_test_flag(&flags, QUEUE_FLAG_DISCON_OUT);
bridge = ast_bridge_call(qe->chan,peer,&config); bridge = ast_bridge_call(qe->chan,peer,&config);
if (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten)) { if (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten)) {