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

Timestamp:

May 2, 2008 2:50:07 PM (16 years ago)

Author:

nanang

Message:

Ticket #528: committed ticket528.patch

File:

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

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

@@ -146 +146 @@
                                        const void *pkt,
                                        pj_size_t size);
+static pj_status_t transport_send_rtcp2(pjmedia_transport *tp,
+                                       const pj_sockaddr_t *addr,
+                                       unsigned addr_len,
+                                       const void *pkt,
+                                       pj_size_t size);
 static pj_status_t transport_media_create(pjmedia_transport *tp,
                                        pj_pool_t *pool,
@@ -172 +177 @@
     &transport_send_rtp,
     &transport_send_rtcp,
+    &transport_send_rtcp2,
     &transport_media_create,
     &transport_media_start,
@@ -658 +664 @@
                                        pj_size_t size)
 {
+    return transport_send_rtcp2(tp, NULL, 0, pkt, size);
+}
+
+static pj_status_t transport_send_rtcp2(pjmedia_transport *tp,
+                                        const pj_sockaddr_t *addr,
+                                        unsigned addr_len,
+                                        const void *pkt,
+                                        pj_size_t size)
+{
     pj_status_t status;
     transport_srtp *srtp = (transport_srtp*) tp;
@@ -663 +678 @@
     err_status_t err;
 
-    if (srtp->bypass_srtp)
-        return pjmedia_transport_send_rtcp(srtp->real_tp, pkt, size);
+    if (srtp->bypass_srtp) {
+        return pjmedia_transport_send_rtcp2(srtp->real_tp, addr, addr_len, 
+                                            pkt, size);
+    }
 
     if (!srtp->session_inited)
@@ -678 +695 @@
     
     if (err == err_status_ok) {
-        status = pjmedia_transport_send_rtcp(srtp->real_tp, srtp->tx_buffer, 
-                                             len);
+        status = pjmedia_transport_send_rtcp2(srtp->real_tp, addr, addr_len,
+                                              srtp->tx_buffer, len);
     } else {
         status = PJMEDIA_ERRNO_FROM_LIBSRTP(err);
@@ -688 +705 @@
     return status;
 }
+
 
 static pj_status_t transport_simulate_lost(pjmedia_transport *tp,