Fixed the ordering of transport_destroy() as well
This commit is contained in:
parent
37968b64ab
commit
d22bede20d
|
@ -1398,6 +1398,11 @@ static pj_status_t transport_destroy (pjmedia_transport *tp)
|
||||||
|
|
||||||
PJ_ASSERT_RETURN(tp, PJ_EINVAL);
|
PJ_ASSERT_RETURN(tp, PJ_EINVAL);
|
||||||
|
|
||||||
|
/* Close member if configured */
|
||||||
|
if (srtp->setting.close_member_tp && srtp->member_tp) {
|
||||||
|
pjmedia_transport_close(srtp->member_tp);
|
||||||
|
}
|
||||||
|
|
||||||
/* Close all keying. Note that any keying should not be destroyed before
|
/* Close all keying. Note that any keying should not be destroyed before
|
||||||
* SRTP transport is destroyed as re-INVITE may initiate new keying method
|
* SRTP transport is destroyed as re-INVITE may initiate new keying method
|
||||||
* without destroying SRTP transport.
|
* without destroying SRTP transport.
|
||||||
|
@ -1405,11 +1410,6 @@ static pj_status_t transport_destroy (pjmedia_transport *tp)
|
||||||
for (i=0; i < srtp->all_keying_cnt; i++)
|
for (i=0; i < srtp->all_keying_cnt; i++)
|
||||||
pjmedia_transport_close(srtp->all_keying[i]);
|
pjmedia_transport_close(srtp->all_keying[i]);
|
||||||
|
|
||||||
/* Close member if configured */
|
|
||||||
if (srtp->setting.close_member_tp && srtp->member_tp) {
|
|
||||||
pjmedia_transport_close(srtp->member_tp);
|
|
||||||
}
|
|
||||||
|
|
||||||
status = pjmedia_transport_srtp_stop(tp);
|
status = pjmedia_transport_srtp_stop(tp);
|
||||||
|
|
||||||
/* In case mutex is being acquired by other thread */
|
/* In case mutex is being acquired by other thread */
|
||||||
|
|
Loading…
Reference in New Issue