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

[Core] Fix possible deadlock in switch_core_media_set_codec()

This commit is contained in:
Andrey Volk 2023-03-23 23:01:17 +03:00
parent 86875d2381
commit b4e43214f7
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/switch_core_media.c
View File

@ -3601,11 +3601,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_set_codec(switch_core_session_
int resetting = 0; int resetting = 0;
switch_media_handle_t *smh; switch_media_handle_t *smh;
switch_rtp_engine_t *a_engine; switch_rtp_engine_t *a_engine;
switch_time_t start = switch_micro_time_now();
switch_assert(session); switch_assert(session);
retry: switch_core_session_lock_codec_write(session);
switch_core_session_lock_codec_read(session);
switch_mutex_lock(session->codec_init_mutex); switch_mutex_lock(session->codec_init_mutex);
if (!(smh = session->media_handle)) { if (!(smh = session->media_handle)) {
@ -3627,17 +3628,7 @@ retry:
(uint32_t) a_engine->read_impl.microseconds_per_packet / 1000 != a_engine->cur_payload_map->codec_ms || (uint32_t) a_engine->read_impl.microseconds_per_packet / 1000 != a_engine->cur_payload_map->codec_ms ||
a_engine->read_impl.samples_per_second != a_engine->cur_payload_map->rm_rate ) { a_engine->read_impl.samples_per_second != a_engine->cur_payload_map->rm_rate ) {
if (switch_core_session_try_reset(session, 0, 0) != SWITCH_STATUS_SUCCESS) { switch_core_session_reset(session, 0, 0);
switch_time_t elapsed = switch_micro_time_now() - start;
if (elapsed > 1000000) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Could not reset session in %"SWITCH_TIME_T_FMT" us. Give up.\n", elapsed);
switch_goto_status(SWITCH_STATUS_FALSE, end);
}
switch_mutex_unlock(session->codec_init_mutex);
switch_yield(10000);
goto retry;
}
switch_channel_audio_sync(session->channel); switch_channel_audio_sync(session->channel);
@ -3651,9 +3642,6 @@ retry:
a_engine->cur_payload_map->codec_ms, a_engine->cur_payload_map->codec_ms,
a_engine->cur_payload_map->rm_rate); a_engine->cur_payload_map->rm_rate);
switch_yield(a_engine->read_impl.microseconds_per_packet);
switch_core_session_lock_codec_write(session);
switch_core_session_lock_codec_read(session);
resetting = 1; resetting = 1;
switch_yield(a_engine->read_impl.microseconds_per_packet); switch_yield(a_engine->read_impl.microseconds_per_packet);
switch_core_codec_destroy(&a_engine->read_codec); switch_core_codec_destroy(&a_engine->read_codec);
@ -3767,12 +3755,13 @@ retry:
if (resetting) { if (resetting) {
switch_channel_execute_on(session->channel, "execute_on_audio_change"); switch_channel_execute_on(session->channel, "execute_on_audio_change");
switch_core_session_unlock_codec_write(session);
switch_core_session_unlock_codec_read(session);
} }
switch_mutex_unlock(session->codec_init_mutex); switch_mutex_unlock(session->codec_init_mutex);
switch_core_session_unlock_codec_read(session);
switch_core_session_unlock_codec_write(session);
return status; return status;
} }
static void clear_ice(switch_core_session_t *session, switch_media_type_t type) static void clear_ice(switch_core_session_t *session, switch_media_type_t type)