提交 0e43313f authored 作者: Mike Jerris's avatar Mike Jerris

Merge pull request #1782 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:FS-11973 to master

* commit '4f66959e':
  FS-11973: [mod_event_multicast] add mutex and checks on hash ptrs on shutdown
...@@ -493,6 +493,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_multicast_shutdown) ...@@ -493,6 +493,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_multicast_shutdown)
globals.running = 0; globals.running = 0;
switch_event_unbind_callback(event_handler); switch_event_unbind_callback(event_handler);
switch_mutex_lock(globals.mutex);
if (globals.udp_socket) { if (globals.udp_socket) {
switch_socket_shutdown(globals.udp_socket, 2); switch_socket_shutdown(globals.udp_socket, 2);
} }
...@@ -501,11 +502,16 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_multicast_shutdown) ...@@ -501,11 +502,16 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_multicast_shutdown)
switch_event_free_subclass(MULTICAST_PEERUP); switch_event_free_subclass(MULTICAST_PEERUP);
switch_event_free_subclass(MULTICAST_PEERDOWN); switch_event_free_subclass(MULTICAST_PEERDOWN);
switch_core_hash_destroy(&globals.event_hash); if (globals.event_hash) {
switch_core_hash_destroy(&globals.peer_hash); switch_core_hash_destroy(&globals.event_hash);
}
if (globals.peer_hash) {
switch_core_hash_destroy(&globals.peer_hash);
}
switch_safe_free(globals.address); switch_safe_free(globals.address);
switch_safe_free(globals.bindings); switch_safe_free(globals.bindings);
switch_mutex_unlock(globals.mutex);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论