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

FS-4578 try this on dev branch HEAD

This commit is contained in:
Anthony Minessale 2012-08-30 16:15:03 -05:00 committed by Ken Rice
parent 13dab11cb2
commit 53e22518ea
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mod/endpoints/mod_rtmp/mod_rtmp.c
View File

@ -634,7 +634,7 @@ switch_call_cause_t rtmp_outgoing_channel(switch_core_session_t *session, switch
switch_core_hash_insert_wrlock(rsession->session_hash, switch_core_session_get_uuid(*newsession), tech_pvt, rsession->session_rwlock); switch_core_hash_insert_wrlock(rsession->session_hash, switch_core_session_get_uuid(*newsession), tech_pvt, rsession->session_rwlock);
if (switch_core_session_thread_launch(tech_pvt->session) != SWITCH_STATUS_SUCCESS) { if (switch_core_session_thread_launch(tech_pvt->session) == SWITCH_STATUS_FALSE) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't spawn thread\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't spawn thread\n");
goto fail; goto fail;
} }
@ -647,7 +647,9 @@ switch_call_cause_t rtmp_outgoing_channel(switch_core_session_t *session, switch
fail: fail:
if (*newsession) { if (*newsession) {
switch_core_session_destroy(newsession); if (!switch_core_session_running(*newsession) && !switch_core_session_started(*newsession)) {
switch_core_session_destroy(newsession);
}
} }
if (rsession) { if (rsession) {
rtmp_session_rwunlock(rsession); rtmp_session_rwunlock(rsession);
@ -847,6 +849,7 @@ switch_call_cause_t rtmp_session_create_call(rtmp_session_t *rsession, switch_co
return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
} }
pool = switch_core_session_get_pool(*newsession); pool = switch_core_session_get_pool(*newsession);
channel = switch_core_session_get_channel(*newsession); channel = switch_core_session_get_channel(*newsession);
switch_channel_set_name(channel, switch_core_session_sprintf(*newsession, "rtmp/%s/%s", rsession->profile->name, number)); switch_channel_set_name(channel, switch_core_session_sprintf(*newsession, "rtmp/%s/%s", rsession->profile->name, number));
@ -911,17 +914,21 @@ switch_call_cause_t rtmp_session_create_call(rtmp_session_t *rsession, switch_co
} }
} }
switch_core_hash_insert_wrlock(rsession->session_hash, switch_core_session_get_uuid(*newsession), tech_pvt, rsession->session_rwlock); if (switch_core_session_thread_launch(tech_pvt->session) == SWITCH_STATUS_FALSE) {
if (switch_core_session_thread_launch(tech_pvt->session) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't spawn thread\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't spawn thread\n");
goto fail; goto fail;
} }
switch_core_hash_insert_wrlock(rsession->session_hash, switch_core_session_get_uuid(*newsession), tech_pvt, rsession->session_rwlock);
return SWITCH_CAUSE_SUCCESS; return SWITCH_CAUSE_SUCCESS;
fail: fail:
switch_core_session_destroy(newsession);
if (!switch_core_session_running(*newsession) && !switch_core_session_started(*newsession)) {
switch_core_session_destroy(newsession);
}
return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
} }