mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-08-14 01:49:05 +00:00
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8006 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
@@ -862,13 +862,12 @@ SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session)
|
||||
{
|
||||
uint8_t ret;
|
||||
|
||||
if (!rtp_session || !rtp_session->flag_mutex) {
|
||||
if (!rtp_session || !rtp_session->flag_mutex || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SHUTDOWN)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
switch_mutex_lock(rtp_session->flag_mutex);
|
||||
ret = (rtp_session != NULL &&
|
||||
switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) && rtp_session->sock && rtp_session->remote_addr && rtp_session->ready == 2) ? 1 : 0;
|
||||
ret = (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) && rtp_session->sock && rtp_session->remote_addr && rtp_session->ready == 2) ? 1 : 0;
|
||||
switch_mutex_unlock(rtp_session->flag_mutex);
|
||||
|
||||
return ret;
|
||||
@@ -883,7 +882,7 @@ SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session)
|
||||
return;
|
||||
}
|
||||
|
||||
switch_mutex_lock((*rtp_session)->flag_mutex);
|
||||
switch_set_flag_locked((*rtp_session), SWITCH_RTP_FLAG_SHUTDOWN);
|
||||
|
||||
READ_INC((*rtp_session));
|
||||
WRITE_INC((*rtp_session));
|
||||
@@ -893,6 +892,7 @@ SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session)
|
||||
READ_DEC((*rtp_session));
|
||||
WRITE_DEC((*rtp_session));
|
||||
|
||||
switch_mutex_lock((*rtp_session)->flag_mutex);
|
||||
|
||||
switch_rtp_kill_socket(*rtp_session);
|
||||
|
||||
|
Reference in New Issue
Block a user