kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-01 20:43:15 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 83175 via svnmerge from

Browse Source 
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!)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83176 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-09-19 19:14:58 +00:00
parent d65b2ac1ee
commit 86e640bf77
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_iax2.c
+13 -2
View File
@@ -10368,6 +10368,17 @@ static int set_config(char *config_file, int reload)
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 @@ static int reload_config(void)
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);