[asterisk-commits] file: trunk r49260 - in /trunk: ./ channels/chan_iax2.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Tue Jan  2 19:21:41 2007
New Revision: 49260

URL: http://svn.digium.com/view/asterisk?view=rev&rev=49260
Log:
Merged revisions 49259 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49259 | file | 2007-01-02 20:19:53 -0500 (Tue, 02 Jan 2007) | 2 lines

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.

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_iax2.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=49260&r1=49259&r2=49260
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Tue Jan  2 19:21:41 2007
@@ -959,7 +959,10 @@
 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)
@@ -992,7 +995,10 @@
 {
 	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)