mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 04:11:08 +00:00
Lock network retransmission queue in all places that it is used.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@48502 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1746,11 +1746,14 @@ retry:
|
||||
ast_queue_hangup(owner);
|
||||
}
|
||||
|
||||
AST_LIST_LOCK(&iaxq.queue);
|
||||
AST_LIST_TRAVERSE(&iaxq.queue, cur, list) {
|
||||
/* Cancel any pending transmissions */
|
||||
if (cur->callno == pvt->callno)
|
||||
cur->retries = -1;
|
||||
}
|
||||
AST_LIST_UNLOCK(&iaxq.queue);
|
||||
|
||||
if (pvt->reg)
|
||||
pvt->reg->callno = 0;
|
||||
if (!owner) {
|
||||
@@ -2057,8 +2060,11 @@ static int iax2_show_stats(int fd, int argc, char *argv[])
|
||||
{
|
||||
struct iax_frame *cur;
|
||||
int cnt = 0, dead=0, final=0;
|
||||
|
||||
if (argc != 3)
|
||||
return RESULT_SHOWUSAGE;
|
||||
|
||||
AST_LIST_LOCK(&iaxq.queue);
|
||||
AST_LIST_TRAVERSE(&iaxq.queue, cur, list) {
|
||||
if (cur->retries < 0)
|
||||
dead++;
|
||||
@@ -2066,6 +2072,8 @@ static int iax2_show_stats(int fd, int argc, char *argv[])
|
||||
final++;
|
||||
cnt++;
|
||||
}
|
||||
AST_LIST_UNLOCK(&iaxq.queue);
|
||||
|
||||
ast_cli(fd, " IAX Statistics\n");
|
||||
ast_cli(fd, "---------------------\n");
|
||||
ast_cli(fd, "Outstanding frames: %d (%d ingress, %d egress)\n", iax_get_frames(), iax_get_iframes(), iax_get_oframes());
|
||||
|
Reference in New Issue
Block a user