Changeset 5852 for pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

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.

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_ice.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);
     }