Changeset 5788 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

Timestamp:

May 9, 2018 6:58:48 AM (6 years ago)

Author:

ming

Message:

Fixed #2087: Support for RTP and RTCP multiplexing

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -234 +234 @@
     pjmedia_srtp_setting setting;
     unsigned             media_option;
+    pj_bool_t            use_rtcp_mux;      /**< Use RTP& RTCP multiplexing?*/
 
     /* SRTP policy */
@@ -1138 +1139 @@
     }
 
+    /* Check if we are multiplexing RTP & RTCP. */
+    srtp->use_rtcp_mux = (pj_sockaddr_has_addr(&param->rem_addr) &&
+                          pj_sockaddr_cmp(&param->rem_addr,
+                                          &param->rem_rtcp) == 0);
     srtp->member_tp_attached = PJ_TRUE;
     return PJ_SUCCESS;
@@ -1347 +1352 @@
         return;
     }
+
+    /* Check if multiplexing is allowed and the payload indicates RTCP. */
+    if (srtp->use_rtcp_mux) {
+        pjmedia_rtp_hdr *hdr = (pjmedia_rtp_hdr *)pkt;
+  
+        if (hdr->pt >= 64 && hdr->pt <= 95) {   
+            pj_lock_release(srtp->mutex);
+            srtp_rtcp_cb(srtp, pkt, size);
+            return;
+        }
+    }
+    
     err = srtp_unprotect(srtp->srtp_rx_ctx, (pj_uint8_t*)pkt, &len);
+    
     if (srtp->probation_cnt > 0 &&
         (err == srtp_err_status_replay_old ||