Changeset 5783

Timestamp:

Apr 18, 2018 7:45:46 AM (6 years ago)

Author:

nanang

Message:

Re #2096: Start UDP transport earlier to allow early DTLS-SRTP nego.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• transport_srtp_dtls.c (modified) (2 diffs)
• transport_udp.c (modified) (1 diff)

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

@@ -595 +595 @@
 
 
+/* Start socket if member transport is UDP */
+static pj_status_t udp_member_transport_media_start(dtls_srtp *ds)
+{
+    pjmedia_transport_info info;
+    pj_status_t status;
+
+    if (!ds->srtp->member_tp)
+        return PJ_SUCCESS;
+
+    pjmedia_transport_info_init(&info);
+    status = pjmedia_transport_get_info(ds->srtp->member_tp, &info);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    if (info.specific_info_cnt == 1 &&
+        info.spc_info[0].type == PJMEDIA_TRANSPORT_TYPE_UDP)
+    {
+        return pjmedia_transport_media_start(ds->srtp->member_tp, 0, 0, 0, 0);
+    }
+
+    return PJ_SUCCESS;
+}
+
+
 /* Flush write BIO */
 static pj_status_t ssl_flush_wbio(dtls_srtp *ds)
@@ -1183 +1207 @@
         if (status != PJ_SUCCESS)
             goto on_return;
+
+        /* Start member transport if it is UDP, so we can receive packet
+         * (see also #2097).
+         */
+        udp_member_transport_media_start(ds);
     }
 

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

@@ -672 +672 @@
     info->src_rtcp_name = udp->rtcp_src_addr;
 
+    /* Add empty specific info */
+    if (info->specific_info_cnt < PJ_ARRAY_SIZE(info->spc_info)) {
+        pjmedia_transport_specific_info *tsi;
+
+        tsi = &info->spc_info[info->specific_info_cnt++];
+        tsi->type = PJMEDIA_TRANSPORT_TYPE_UDP;
+        tsi->cbsize = 0;
+    }
+
     return PJ_SUCCESS;
 }