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

Cleaning up and standardizing variable name to rsession if the session referenced is an rtmp_session_t

This commit is contained in:
William King 2013-02-25 19:04:09 -08:00
parent 037bd48c8c
commit 3e1d0318a2
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -782,25 +782,25 @@ switch_status_t rtmp_session_request(rtmp_profile_t *profile, rtmp_session_t **n
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
switch_status_t rtmp_session_destroy(rtmp_session_t **session) switch_status_t rtmp_session_destroy(rtmp_session_t **rsession)
{ {
switch_hash_index_t *hi; switch_hash_index_t *hi;
switch_event_t *event; switch_event_t *event;
if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, RTMP_EVENT_DISCONNECT) == SWITCH_STATUS_SUCCESS) { if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, RTMP_EVENT_DISCONNECT) == SWITCH_STATUS_SUCCESS) {
rtmp_event_fill(*session, event); rtmp_event_fill(*rsession, event);
switch_event_fire(&event); switch_event_fire(&event);
} }
switch_core_hash_delete_wrlock(rtmp_globals.session_hash, (*session)->uuid, rtmp_globals.session_rwlock); switch_core_hash_delete_wrlock(rtmp_globals.session_hash, (*rsession)->uuid, rtmp_globals.session_rwlock);
switch_core_hash_delete_wrlock((*session)->profile->session_hash, (*session)->uuid, (*session)->profile->session_rwlock); switch_core_hash_delete_wrlock((*rsession)->profile->session_hash, (*rsession)->uuid, (*rsession)->profile->session_rwlock);
rtmp_clear_registration(*session, NULL, NULL); rtmp_clear_registration(*rsession, NULL, NULL);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "RTMP session ended [%s]\n", (*session)->uuid); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "RTMP session ended [%s]\n", (*rsession)->uuid);
(*session)->state = RS_DESTROY; (*rsession)->state = RS_DESTROY;
switch_thread_rwlock_rdlock((*session)->session_rwlock); switch_thread_rwlock_rdlock((*rsession)->session_rwlock);
for (hi = switch_hash_first(NULL, (*session)->session_hash); hi; hi = switch_hash_next(hi)) { for (hi = switch_hash_first(NULL, (*rsession)->session_hash); hi; hi = switch_hash_next(hi)) {
void *val; void *val;
const void *key; const void *key;
switch_ssize_t keylen; switch_ssize_t keylen;
@ -814,34 +814,34 @@ switch_status_t rtmp_session_destroy(rtmp_session_t **session)
switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
} }
} }
switch_thread_rwlock_unlock((*session)->session_rwlock); switch_thread_rwlock_unlock((*rsession)->session_rwlock);
while ((*session)->active_sessions > 0) { while ((*rsession)->active_sessions > 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Still have %d sessions, waiting\n", (*session)->active_sessions); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Still have %d sessions, waiting\n", (*rsession)->active_sessions);
switch_yield(500000); switch_yield(500000);
} }
switch_thread_rwlock_wrlock((*session)->rwlock); switch_thread_rwlock_wrlock((*rsession)->rwlock);
switch_thread_rwlock_unlock((*session)->rwlock); switch_thread_rwlock_unlock((*rsession)->rwlock);
(*session)->profile->io->close(*session); (*rsession)->profile->io->close(*rsession);
#ifdef RTMP_DEBUG_IO #ifdef RTMP_DEBUG_IO
fclose((*session)->io_debug_in); fclose((*rsession)->io_debug_in);
fclose((*session)->io_debug_out); fclose((*rsession)->io_debug_out);
#endif #endif
switch_mutex_lock((*session)->profile->mutex); switch_mutex_lock((*rsession)->profile->mutex);
(*session)->profile->clients--; (*rsession)->profile->clients--;
switch_mutex_unlock((*session)->profile->mutex); switch_mutex_unlock((*rsession)->profile->mutex);
switch_core_hash_destroy(&(*session)->session_hash); switch_core_hash_destroy(&(*rsession)->session_hash);
switch_core_destroy_memory_pool(&(*session)->pool); switch_core_destroy_memory_pool(&(*rsession)->pool);
*session = NULL; *rsession = NULL;
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }