kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

* commit '4f66959ed325ed6dd58c8b48f80d42aaca1902bd':
  FS-11973: [mod_event_multicast] add mutex and checks on hash ptrs on shutdown
This commit is contained in:
Mike Jerris 2019-08-01 13:32:02 -05:00
parent 7c773b28d9 4f66959ed3
commit 0e43313f79
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
View File

@ -493,6 +493,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_multicast_shutdown)
globals.running = 0;
switch_event_unbind_callback(event_handler);
switch_mutex_lock(globals.mutex);
if (globals.udp_socket) {
switch_socket_shutdown(globals.udp_socket, 2);
}
@ -501,11 +502,16 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_multicast_shutdown)
switch_event_free_subclass(MULTICAST_PEERUP);
switch_event_free_subclass(MULTICAST_PEERDOWN);
switch_core_hash_destroy(&globals.event_hash);
switch_core_hash_destroy(&globals.peer_hash);
if (globals.event_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.bindings);
switch_mutex_unlock(globals.mutex);
return SWITCH_STATUS_SUCCESS;
}