From 40707f097a3aaf25a181fc5e813ef282a4fd442f Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 3 Jan 2007 01:19:53 +0000 Subject: [PATCH] Check pvt structure presence before passing to send_command. This gets rid of the irritating message about a packet without pvt structure. This happens because the scheduled item is getting cancelled at almost the exact moment it is getting executed. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@49259 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 2c80242b84..43c6e05d2f 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -915,7 +915,10 @@ static int __schedule_action(void (*func)(void *data), void *data, const char *f static void __send_ping(void *data) { int callno = (long)data; - send_command_locked(callno, AST_FRAME_IAX, IAX_COMMAND_PING, 0, NULL, 0, -1); + ast_mutex_lock(&iaxsl[callno]); + if (iaxs[callno]) + send_command(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_PING, 0, NULL, 0, -1); + ast_mutex_unlock(&iaxsl[callno]); } static int send_ping(void *data) @@ -948,7 +951,10 @@ static void __send_lagrq(void *data) { int callno = (long)data; /* Ping only if it's real not if it's bridged */ - send_command_locked(callno, AST_FRAME_IAX, IAX_COMMAND_LAGRQ, 0, NULL, 0, -1); + ast_mutex_lock(&iaxsl[callno]); + if (iaxs[callno]) + send_command(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_LAGRQ, 0, NULL, 0, -1); + ast_mutex_unlock(&iaxsl[callno]); } static int send_lagrq(void *data)