Author: anthm Date: Fri Feb 15 11:15:32 2008 New Revision: 7619 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Feb 15 11:15:32 2008 @@ -1230,7 +1230,7 @@ ldl_session_destroy(&tech_pvt->dlsession); } - if (switch_rtp_ready(tech_pvt->rtp_session)) { + if (tech_pvt->rtp_session) { switch_rtp_destroy(&tech_pvt->rtp_session); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "NUKE RTP\n"); tech_pvt->rtp_session = NULL; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Feb 15 11:15:32 2008 @@ -1003,11 +1003,16 @@ switch_yield(10000); loops++; } + } + + if (tech_pvt->rtp_session) { switch_rtp_destroy(&tech_pvt->rtp_session); } - if (switch_rtp_ready(tech_pvt->video_rtp_session)) { + + if (tech_pvt->video_rtp_session) { switch_rtp_destroy(&tech_pvt->video_rtp_session); } + } switch_status_t sofia_glue_tech_set_video_codec(private_object_t *tech_pvt, int force) Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Feb 15 11:15:32 2008 @@ -843,19 +843,15 @@ } if (switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_SECURE_SEND)) { - switch_mutex_lock((*rtp_session)->flag_mutex); srtp_dealloc((*rtp_session)->send_ctx); (*rtp_session)->send_ctx = NULL; switch_clear_flag((*rtp_session), SWITCH_RTP_FLAG_SECURE_SEND); - switch_mutex_unlock((*rtp_session)->flag_mutex); } if (switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_SECURE_RECV)) { - switch_mutex_lock((*rtp_session)->flag_mutex); srtp_dealloc((*rtp_session)->recv_ctx); (*rtp_session)->recv_ctx = NULL; switch_clear_flag((*rtp_session), SWITCH_RTP_FLAG_SECURE_RECV); - switch_mutex_unlock((*rtp_session)->flag_mutex); } if ((*rtp_session)->timer.timer_interface) {