dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Fix potential seg in queue code 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1165 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2003-07-08 13:32:13 +00:00
parent 2ceec21010
commit f80476046d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/app_queue.c
View File

@ -180,7 +180,7 @@ static int join_queue(char *queuename, struct queue_ent *qe)
res = 0; res = 0;
manager_event(EVENT_FLAG_CALL, "Join", manager_event(EVENT_FLAG_CALL, "Join",
"Channel: %s\r\nCallerID:%s\r\nQueue: %s\r\nPosition: %d\r\nCount: %d\r\n", "Channel: %s\r\nCallerID:%s\r\nQueue: %s\r\nPosition: %d\r\nCount: %d\r\n",
qe->chan->name, qe->chan->callerid ? qe->chan->callerid : "", q->name, qe->pos, q->count ); qe->chan->name, (qe->chan->callerid ? qe->chan->callerid : ""), q->name, qe->pos, q->count );
#if 0 #if 0
ast_log(LOG_NOTICE, "Queue '%s' Join, Channel '%s', Position '%d'\n", q->name, qe->chan->name, qe->pos ); ast_log(LOG_NOTICE, "Queue '%s' Join, Channel '%s', Position '%d'\n", q->name, qe->chan->name, qe->pos );
#endif #endif
@ -590,6 +590,14 @@ static int try_calling(struct queue_ent *qe, char *options, char *announceoverri
/* Ah ha! Someone answered within the desired timeframe. Of course after this /* Ah ha! Someone answered within the desired timeframe. Of course after this
we will always return with -1 so that it is hung up properly after the we will always return with -1 so that it is hung up properly after the
conversation. */ conversation. */
if (!strcmp(qe->chan->type,"Zap")) {
if (tmp->dataquality) zapx = 0;
ast_channel_setoption(qe->chan,AST_OPTION_TONE_VERIFY,&zapx,sizeof(char),0);
}
if (!strcmp(peer->type,"Zap")) {
if (tmp->dataquality) zapx = 0;
ast_channel_setoption(peer,AST_OPTION_TONE_VERIFY,&zapx,sizeof(char),0);
}
hanguptree(outgoing, peer); hanguptree(outgoing, peer);
/* Stop music on hold */ /* Stop music on hold */
ast_moh_stop(qe->chan); ast_moh_stop(qe->chan);
@ -619,14 +627,6 @@ static int try_calling(struct queue_ent *qe, char *options, char *announceoverri
ast_hangup(peer); ast_hangup(peer);
return -1; return -1;
} }
if (!strcmp(qe->chan->type,"Zap")) {
if (tmp->dataquality) zapx = 0;
ast_channel_setoption(qe->chan,AST_OPTION_TONE_VERIFY,&zapx,sizeof(char),0);
}
if (!strcmp(peer->type,"Zap")) {
if (tmp->dataquality) zapx = 0;
ast_channel_setoption(peer,AST_OPTION_TONE_VERIFY,&zapx,sizeof(char),0);
}
/* Drop out of the queue at this point, to prepare for next caller */ /* Drop out of the queue at this point, to prepare for next caller */
leave_queue(qe); leave_queue(qe);
/* JDG: sendurl */ /* JDG: sendurl */