Changeset 5750

Timestamp:

Mar 6, 2018 7:42:54 AM (7 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().

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/transport.h (modified) (3 diffs)
• src/pjmedia/transport_srtp_dtls.c (modified) (4 diffs)
• src/pjmedia/transport_udp.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/transport.h

@@ -683 +683 @@
  */
 PJ_INLINE(pj_status_t) pjmedia_transport_attach2(pjmedia_transport *tp,
-                                      pjmedia_transport_attach_param *att_param)
+                                  pjmedia_transport_attach_param *att_param)
 {
     if (tp->op->attach2) {
-        return tp->op->attach2(tp, att_param);
+        return (*tp->op->attach2)(tp, att_param);
     } else {
-        return tp->op->attach(tp, att_param->user_data, 
-                              (pj_sockaddr_t*)&att_param->rem_addr, 
-                              (pj_sockaddr_t*)&att_param->rem_rtcp, 
-                              att_param->addr_len, att_param->rtp_cb, 
-                              att_param->rtcp_cb);
+        return (*tp->op->attach)(tp, att_param->user_data, 
+                                 (pj_sockaddr_t*)&att_param->rem_addr, 
+                                 (pj_sockaddr_t*)&att_param->rem_rtcp, 
+                                 att_param->addr_len, att_param->rtp_cb, 
+                                 att_param->rtcp_cb);
     }
 }
@@ -730 +730 @@
                                                                 pj_ssize_t))
 {
-    return tp->op->attach(tp, user_data, rem_addr, rem_rtcp, addr_len, 
-                          rtp_cb, rtcp_cb);
+    if (tp->op->attach2) {
+        pjmedia_transport_attach_param param;
+
+        pj_bzero(&param, sizeof(param));
+        param.user_data = user_data;
+        pj_sockaddr_cp(&param.rem_addr, rem_addr);
+        pj_sockaddr_cp(&param.rem_rtcp, rem_rtcp);
+        param.addr_len = addr_len;
+        param.rtp_cb = rtp_cb;
+        param.rtcp_cb = rtcp_cb;
+
+        return (*tp->op->attach2)(tp, &param);
+    } else {
+        return (*tp->op->attach)(tp, user_data, rem_addr, rem_rtcp, addr_len,
+                                 rtp_cb, rtcp_cb);
+    }
 }
 
@@ -750 +764 @@
                                          void *user_data)
 {
-    tp->op->detach(tp, user_data);
+    (*tp->op->detach)(tp, user_data);
 }
 

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);

pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c

@@ -839 +839 @@
 
         /* As additional checking, check if the same user data is specified */
-        pj_assert(user_data == udp->user_data);
+        pj_assert(!udp->user_data || user_data == udp->user_data);
 
         /* First, mark transport as unattached */