[asterisk-commits] russell: trunk r83176 - in /trunk: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Sep 19 14:14:58 2007
New Revision: 83176

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

........
r83175 | russell | 2007-09-19 14:13:29 -0500 (Wed, 19 Sep 2007) | 8 lines

When handling a reload of chan_iax2, don't use an ao2_callback() to POKE all
peers.  Instead, use an iterator.  By using an iterator, the peers container
is not locked while the POKE is being done.  It can cause a deadlock if the
peers container is locked because poking a peer will try to lock pvt structs,
while there is a lot of other code that will hold a pvt lock when trying to
go lock the peers container.
(reported to me directly by Loic Didelot.  Thank you for the debug info!)

........

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=83176&r1=83175&r2=83176
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Wed Sep 19 14:14:58 2007
@@ -10368,6 +10368,17 @@
 	return 1;
 }
 
+static void poke_all_peers(void)
+{
+	struct ao2_iterator i;
+	struct iax2_peer *peer;
+
+	i = ao2_iterator_init(peers, 0);
+	while ((peer = ao2_iterator_next(&i))) {
+		iax2_poke_peer(peer, 0);
+		peer_unref(peer);
+	}
+}
 static int reload_config(void)
 {
 	char *config = "iax.conf";
@@ -10385,9 +10396,9 @@
 		AST_LIST_UNLOCK(&registrations);
 
 		/* Qualify hosts, too */
-		ao2_callback(peers, 0, iax2_poke_peer_cb, NULL);
-	}
-
+		poke_all_peers();
+	}
+	
 	reload_firmware(0);
 	iax_provision_reload(1);