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

Timestamp:

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

Author:

ming

Message:

Fixed #2087: Support for RTP and RTCP multiplexing

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c (modified) (2 diffs)

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

@@ -986 +986 @@
             pj_sockaddr_cp(&ap.rem_addr, &ds->rem_addr);
             ap.addr_len = pj_sockaddr_get_len(&ap.rem_addr);
-            if (pj_sockaddr_has_addr(&ds->rem_rtcp)) {
+            if (pj_sockaddr_cmp(&info.sock_info.rtp_addr_name,
+                                &info.sock_info.rtcp_addr_name) == 0)
+            {
+                /* Using RTP & RTCP multiplexing */
+                pj_sockaddr_cp(&ds->rem_rtcp, &ds->rem_addr);
+                pj_sockaddr_cp(&ap.rem_rtcp, &ds->rem_rtcp);
+            } else if (pj_sockaddr_has_addr(&ds->rem_rtcp)) {
                 pj_sockaddr_cp(&ap.rem_rtcp, &ds->rem_rtcp);
             } else {
@@ -1187 +1193 @@
     {
         pjmedia_transport_attach_param ap;
+        pjmedia_transport_info info;
+
         pj_bzero(&ap, sizeof(ap));
         ap.user_data = ds->srtp;
+        pjmedia_transport_get_info(ds->srtp->member_tp, &info);
 
         if (sdp_remote)
             get_rem_addrs(ds, sdp_remote, media_index);
 
-        if (pj_sockaddr_has_addr(&ds->rem_addr))
+        if (pj_sockaddr_has_addr(&ds->rem_addr)) {
             pj_sockaddr_cp(&ap.rem_addr, &ds->rem_addr);
-        else
+        } else if (pj_sockaddr_has_addr(&info.sock_info.rtp_addr_name)) {
+            pj_sockaddr_cp(&ap.rem_addr, &info.sock_info.rtp_addr_name);
+        } else {
             pj_sockaddr_init(pj_AF_INET(), &ap.rem_addr, 0, 0);
-
-        if (pj_sockaddr_has_addr(&ds->rem_rtcp))
+        }
+
+        if (pj_sockaddr_cmp(&info.sock_info.rtp_addr_name,
+                            &info.sock_info.rtcp_addr_name) == 0)
+        {
+            /* Using RTP & RTCP multiplexing */
+            pj_sockaddr_cp(&ap.rem_rtcp, &ap.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(&info.sock_info.rtcp_addr_name)) {
+            pj_sockaddr_cp(&ap.rem_rtcp, &info.sock_info.rtcp_addr_name);
+        } else {
             pj_sockaddr_init(pj_AF_INET(), &ap.rem_rtcp, 0, 0);
+        }
 
         ap.addr_len = pj_sockaddr_get_len(&ap.rem_addr);