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

Timestamp:

Jul 5, 2012 7:26:29 AM (12 years ago)

Author:

nanang

Message:

Fix #1547:

• Added PJMEDIA_MAX_MRU to specify maximum packet size in receiving direction.
• Added max_pkt_size into pj_turn_sock_cfg, default is PJ_TURN_MAX_PKT_LEN.
• Fixed hardcoded MTU settings in media transport SRTP.
• Added MIN_CHUNKS_PER_FRM constant in video stream.

Notes:

• PJMEDIA_MAX_MTU & PJMEDIA_MAX_MRU to specify max packet size for TX and RX dir.
• For ICE media transport, TURN session limits outgoing packet size to PJ_TURN_MAX_PKT_LEN (the size of internal buffer for inserting TURN overheads).

File:

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

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

@@ -35 +35 @@
 #define THIS_FILE   "transport_srtp.c"
 
-/* Maximum size of packet */
-#define MAX_RTP_BUFFER_LEN          1500
-#define MAX_RTCP_BUFFER_LEN         1500
+/* Maximum size of outgoing packet */
+#define MAX_RTP_BUFFER_LEN          PJMEDIA_MAX_MTU
+#define MAX_RTCP_BUFFER_LEN         PJMEDIA_MAX_MTU
+
+/* Maximum SRTP crypto key length */
 #define MAX_KEY_LEN                 32
 
@@ -778 +780 @@
         return pjmedia_transport_send_rtp(srtp->member_tp, pkt, size);
 
-    if (size > sizeof(srtp->rtp_tx_buffer))
+    if (size > sizeof(srtp->rtp_tx_buffer) - 10)
         return PJ_ETOOBIG;
 
@@ -792 +794 @@
 
     if (err == err_status_ok) {
-        status = pjmedia_transport_send_rtp(srtp->member_tp, srtp->rtp_tx_buffer, len);
+        status = pjmedia_transport_send_rtp(srtp->member_tp, 
+                                            srtp->rtp_tx_buffer, len);
     } else {
         status = PJMEDIA_ERRNO_FROM_LIBSRTP(err);
@@ -823 +826 @@
     }
 
-    if (size > sizeof(srtp->rtcp_tx_buffer))
+    if (size > sizeof(srtp->rtcp_tx_buffer) - 10)
         return PJ_ETOOBIG;