Changeset 5852 for pjproject

Timestamp:

Aug 3, 2018 2:33:28 AM (6 years ago)

Author:

ming

Message:

Re #2096: DTLS updates

• Fix assertion when DTLS tries to attach transport, but the ICE transport's source RTP address hasn't been updated.
• Fix DTLS transport attachment in dtls_media_start() which misses rtcp-mux checking, causing rtcp-mux to be disabled.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• transport_ice.c (modified) (4 diffs)
• transport_srtp_dtls.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

@@ -80 +80 @@
     pj_bool_t            use_ice;
     pj_sockaddr          rtp_src_addr;  /**< Actual source RTP address.     */
+    unsigned             rtp_src_cnt;   /**< How many pkt from this addr.   */
     pj_sockaddr          rtcp_src_addr; /**< Actual source RTCP address.    */
     unsigned             rtcp_src_cnt;  /**< How many pkt from this addr.   */
@@ -1764 +1765 @@
      * ICE activated or received any packets.
      */
-    if (tp_ice->use_ice) {
-        info->src_rtp_name  = tp_ice->rtp_src_addr;
-    }
-    if (tp_ice->use_ice || tp_ice->rtcp_src_cnt) {
-        info->src_rtcp_name = tp_ice->rtcp_src_addr;
+    if (tp_ice->use_ice || tp_ice->rtp_src_cnt) {
+        pj_sockaddr_cp(&info->src_rtp_name, &tp_ice->rtp_src_addr);
+        if (tp_ice->use_rtcp_mux)
+            pj_sockaddr_cp(&info->src_rtcp_name, &tp_ice->rtp_src_addr);
+    }
+    if ((!tp_ice->use_rtcp_mux) &&
+        (tp_ice->use_ice || tp_ice->rtcp_src_cnt))
+    {
+        pj_sockaddr_cp(&info->src_rtcp_name, &tp_ice->rtcp_src_addr);
     }
 
@@ -1861 +1866 @@
     tp_ice->rtp_src_addr = tp_ice->remote_rtp;
     pj_bzero(&tp_ice->rtcp_src_addr, sizeof(tp_ice->rtcp_src_addr));
-    tp_ice->rtcp_src_cnt = 0;
+    tp_ice->rtp_src_cnt = tp_ice->rtcp_src_cnt = 0;
 
     return PJ_SUCCESS;
@@ -1946 +1951 @@
         /* Destroy on progress */
         return;
+    }
+
+    if (comp_id == 1) {
+        ++tp_ice->rtp_src_cnt;
+        pj_sockaddr_cp(&tp_ice->rtp_src_addr, src_addr);
+    } else if (comp_id == 2) {
+        pj_sockaddr_cp(&tp_ice->rtcp_src_addr, src_addr);
     }
 

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

@@ -1330 +1330 @@
     dtls_srtp *ds = (dtls_srtp *)tp;
     pj_ice_strans_state ice_state;
+    pj_bool_t use_rtcp_mux = PJ_FALSE;
     pj_status_t status = PJ_SUCCESS;
 
@@ -1369 +1370 @@
     }
 
-    /* Check and update ICE status */
+    /* Check and update ICE and rtcp-mux status */
     {
         pjmedia_transport_info info;
@@ -1376 +1377 @@
         pjmedia_transport_info_init(&info);
         pjmedia_transport_get_info(ds->srtp->member_tp, &info);
+        if (pj_sockaddr_cmp(&info.sock_info.rtp_addr_name,
+                            &info.sock_info.rtcp_addr_name) == 0)
+        {
+            use_rtcp_mux = PJ_TRUE;
+        }
         ice_info = (pjmedia_ice_transport_info*)
                    pjmedia_transport_info_get_spc_info(
@@ -1435 +1441 @@
                 pj_sockaddr_init(pj_AF_INET(), &ap.rem_addr, 0, 0);
 
-            if (pj_sockaddr_has_addr(&ds->rem_rtcp))
+            if (use_rtcp_mux) {
+                /* Using RTP & RTCP multiplexing */
+                pj_sockaddr_cp(&ap.rem_rtcp, &ds->rem_addr);
+            } else if (pj_sockaddr_has_addr(&ds->rem_rtcp)) {
                 pj_sockaddr_cp(&ap.rem_rtcp, &ds->rem_rtcp);
-            else
+            } else if (pj_sockaddr_has_addr(&ds->rem_addr)) {
+                pj_sockaddr_cp(&ap.rem_rtcp, &ds->rem_addr);
+                pj_sockaddr_set_port(&ap.rem_rtcp,
+                                     pj_sockaddr_get_port(&ap.rem_rtcp) + 1);
+            } else {
                 pj_sockaddr_init(pj_AF_INET(), &ap.rem_rtcp, 0, 0);
+            }
 
             ap.addr_len = pj_sockaddr_get_len(&ap.rem_addr);