diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-19 19:13:29 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-19 19:13:29 +0000 |
commit | ed2a3f719c79a1707656331dbdc39eace21fa515 (patch) | |
tree | 5aca927bc31869d1128b4d00979a67a18020587a /channels | |
parent | be54c6301af330d8619524b01d1cf91d3f3e1c1a (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.4@83175 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_iax2.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 3e5309970..8fcf40139 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -9812,6 +9812,17 @@ static int set_config(char *config_file, int reload) return capability; } +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"; @@ -9836,7 +9847,7 @@ static int reload_config(void) iax2_do_register(reg); AST_LIST_UNLOCK(®istrations); /* Qualify hosts, too */ - ao2_callback(peers, 0, iax2_poke_peer_cb, NULL); + poke_all_peers(); reload_firmware(0); iax_provision_reload(); |