kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-23 11:36:09 +00:00
Code Issues Projects Releases Wiki Activity

FS-10827 [mod_spandsp] Make thread safe and xmlreload do not affect already started detection

Browse Source
This commit is contained in:
Hunyadvári Péter 2017-12-06 14:03:17 +01:00 committed by Mike Jerris
parent 99df402921
commit 434baefcd0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mod/applications/mod_spandsp/mod_spandsp_dsp.c
View File

@ -723,13 +723,12 @@ static void tone_segment_callback(void *user_data, int f1, int f2, int duration)
*/ */
static switch_status_t tone_detector_create(switch_core_session_t *session, tone_detector_t **detector, tone_descriptor_t *descriptor) static switch_status_t tone_detector_create(switch_core_session_t *session, tone_detector_t **detector, tone_descriptor_t *descriptor)
{ {
tone_detector_t *ldetector = NULL; tone_detector_t *ldetector = switch_core_session_alloc(session, sizeof(tone_detector_t));
ldetector = switch_core_session_alloc(session, sizeof(tone_detector_t)); tone_descriptor_t *desc = switch_core_session_alloc(session, sizeof(tone_descriptor_t));
if (!ldetector) {
return SWITCH_STATUS_FALSE; memcpy(desc, descriptor, sizeof(tone_descriptor_t));
}
memset(ldetector, 0, sizeof(tone_detector_t)); ldetector->descriptor = desc;
ldetector->descriptor = descriptor;
ldetector->debug = spandsp_globals.tonedebug; ldetector->debug = spandsp_globals.tonedebug;
ldetector->session = session; ldetector->session = session;
*detector = ldetector; *detector = ldetector;
@ -802,13 +801,18 @@ switch_status_t callprogress_detector_start(switch_core_session_t *session, cons
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
switch_mutex_lock(spandsp_globals.mutex);
/* find the tone descriptor with the matching name and create the detector */ /* find the tone descriptor with the matching name and create the detector */
descriptor = switch_core_hash_find(spandsp_globals.tones, name); descriptor = switch_core_hash_find(spandsp_globals.tones, name);
if (!descriptor) { if (!descriptor) {
switch_mutex_unlock(spandsp_globals.mutex);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "no tone descriptor defined with name '%s'. Update configuration. \n", name); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "no tone descriptor defined with name '%s'. Update configuration. \n", name);
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
tone_detector_create(session, &detector, descriptor); tone_detector_create(session, &detector, descriptor);
switch_mutex_unlock(spandsp_globals.mutex);
/* start listening for tones */ /* start listening for tones */
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Starting tone detection for '%s'\n", name); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Starting tone detection for '%s'\n", name);