Changeset 2144

Timestamp:

Jul 14, 2008 6:36:50 PM (16 years ago)

Author:

nanang

Message:

Ticket #569: Updated SRTP locking to not guard member transport when sending packet; added separate tx_buffer for RTCP since tx_buffer is not guarded by SRTP lock anymore

File:

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

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

@@ -34 +34 @@
 
 /* Maximum size of packet */
-#define MAX_BUFFER_LEN  1500
-#define MAX_KEY_LEN     32
-#define DEACTIVATE_MEDIA(pool, m) pjmedia_sdp_media_deactivate(pool, m)
+#define MAX_RTP_BUFFER_LEN          1500
+#define MAX_RTCP_BUFFER_LEN         1500
+#define MAX_KEY_LEN                 32
+#define DEACTIVATE_MEDIA(pool, m)   pjmedia_sdp_media_deactivate(pool, m)
 
 static const pj_str_t ID_RTP_AVP  = { "RTP/AVP", 7 };
@@ -79 +80 @@
     pj_pool_t           *pool;
     pj_lock_t           *mutex;
-    char                 tx_buffer[MAX_BUFFER_LEN];
+    char                 rtp_tx_buffer[MAX_RTP_BUFFER_LEN];
+    char                 rtcp_tx_buffer[MAX_RTCP_BUFFER_LEN];
     pjmedia_srtp_setting setting;
     unsigned             media_option;
@@ -657 +659 @@
         return PJ_SUCCESS;
 
-    if (size > sizeof(srtp->tx_buffer))
+    if (size > sizeof(srtp->rtp_tx_buffer))
         return PJ_ETOOBIG;
 
+    pj_memcpy(srtp->rtp_tx_buffer, pkt, size);
+
     pj_lock_acquire(srtp->mutex);
-    pj_memcpy(srtp->tx_buffer, pkt, size);
-    
-    err = srtp_protect(srtp->srtp_tx_ctx, srtp->tx_buffer, &len);
+    err = srtp_protect(srtp->srtp_tx_ctx, srtp->rtp_tx_buffer, &len);
+    pj_lock_release(srtp->mutex);
+
     if (err == err_status_ok) {
-        status = pjmedia_transport_send_rtp(srtp->member_tp, srtp->tx_buffer, len);
+        status = pjmedia_transport_send_rtp(srtp->member_tp, srtp->rtp_tx_buffer, len);
     } else {
         status = PJMEDIA_ERRNO_FROM_LIBSRTP(err);
     }
     
-    pj_lock_release(srtp->mutex);
-
     return status;
 }
@@ -701 +703 @@
         return PJ_SUCCESS;
 
-    if (size > sizeof(srtp->tx_buffer))
+    if (size > sizeof(srtp->rtcp_tx_buffer))
         return PJ_ETOOBIG;
 
+    pj_memcpy(srtp->rtcp_tx_buffer, pkt, size);
+
     pj_lock_acquire(srtp->mutex);
-    pj_memcpy(srtp->tx_buffer, pkt, size);
-
-    err = srtp_protect_rtcp(srtp->srtp_tx_ctx, srtp->tx_buffer, &len);
-    
+    err = srtp_protect_rtcp(srtp->srtp_tx_ctx, srtp->rtcp_tx_buffer, &len);
+    pj_lock_release(srtp->mutex);
+
     if (err == err_status_ok) {
         status = pjmedia_transport_send_rtcp2(srtp->member_tp, addr, addr_len,
-                                              srtp->tx_buffer, len);
+                                              srtp->rtcp_tx_buffer, len);
     } else {
         status = PJMEDIA_ERRNO_FROM_LIBSRTP(err);
     }
-
-    pj_lock_release(srtp->mutex);
 
     return status;