Stop member transport first before destroying keying

Fixed the ordering of transport_destroy() as well
Merge branch 'master' into dtls-race
2023-05-05 12:44:11 +08:00 · 2023-05-04 18:43:12 +08:00 · 2023-05-04 18:42:03 +08:00 · 2022-12-21 11:45:20 +08:00
1 changed files with 6 additions and 0 deletions
--- a/pjmedia/src/pjmedia/transport_srtp.c
+++ b/pjmedia/src/pjmedia/transport_srtp.c
@ -1398,6 +1398,12 @@ static pj_status_t transport_destroy  (pjmedia_transport *tp)

    PJ_ASSERT_RETURN(tp, PJ_EINVAL);

+    /* Since we are about to destroy our keying transports, stop member
+     * transport first to make sure it no longer process any data and
+     * potentially pass it to the keying transports.
+     */
+    pjmedia_transport_media_stop(srtp->member_tp);
+
    /* Close all keying. Note that any keying should not be destroyed before
     * SRTP transport is destroyed as re-INVITE may initiate new keying method
     * without destroying SRTP transport.
Author	SHA1	Message	Date
sauwming	a5f304a187	Stop member transport first before destroying keying	2023-05-05 12:44:11 +08:00
sauwming	d22bede20d	Fixed the ordering of transport_destroy() as well	2023-05-04 18:43:12 +08:00
sauwming	37968b64ab	Merge branch 'master' into dtls-race	2023-05-04 18:42:03 +08:00
sauwming	c7d90d0a61	Fixed race condition between DTLS stoppage and incoming packet processing	2022-12-21 11:45:20 +08:00