Changeset 5750 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

Timestamp:

Mar 6, 2018 7:42:54 AM (6 years ago)

Author:

nanang

Message:

Re #2096:

• Fixed crash in media transport when application calls detach() while the transport only implements detach2().
• Avoid assertion in UDP media transport when calling detach() without previously calling attach().

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

@@ -957 +957 @@
 
             pj_bzero(&ap, sizeof(ap));
+            ap.user_data = ds->srtp;
             pj_sockaddr_cp(&ds->rem_addr, &info.src_rtp_name);
             pj_sockaddr_cp(&ap.rem_addr, &ds->rem_addr);
@@ -1143 +1144 @@
         pjmedia_transport_attach_param ap;
         pj_bzero(&ap, sizeof(ap));
+        ap.user_data = ds->srtp;
 
         if (sdp_remote)
@@ -1294 +1296 @@
             pjmedia_transport_attach_param ap;
             pj_bzero(&ap, sizeof(ap));
+            ap.user_data = ds->srtp;
 
             /* Attach ourselves to member transport for DTLS nego. */
@@ -1421 +1424 @@
     /* Attach member transport, so we can send/receive DTLS init packets */
     pj_bzero(&ap, sizeof(ap));
+    ap.user_data = ds->srtp;
     pj_sockaddr_cp(&ap.rem_addr, &ds->rem_addr);
     pj_sockaddr_cp(&ap.rem_rtcp, &ds->rem_rtcp);