Changeset 5639 for pjproject/trunk/pjmedia/include/pjmedia/config.h

Timestamp:

Aug 2, 2017 10:44:10 AM (7 years ago)

Author:

riza

Message:

Fix #2035: Make sure transport SRTP buf size is sufficient before calling
srtp_protect() and srtp_protect_rtcp().

File:

• pjproject/trunk/pjmedia/include/pjmedia/config.h (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -1380 +1380 @@
  * PJMEDIA_MAX_MTU.
  *
- * Default: (PJMEDIA_MAX_MTU - 100)
- */
-#ifndef PJMEDIA_MAX_VID_PAYLOAD_SIZE                    
-#  define PJMEDIA_MAX_VID_PAYLOAD_SIZE          (PJMEDIA_MAX_MTU - 100)
+ * Default: (PJMEDIA_MAX_MTU - SRTP_MAX_TRAILER_LEN) if SRTP is enabled, 
+ *          otherwise (PJMEDIA_MAX_MTU - 100)
+ */
+#ifndef PJMEDIA_MAX_VID_PAYLOAD_SIZE
+/* Include SRTP_MAX_TRAILER_LEN definition. */
+#   if defined(PJMEDIA_EXTERNAL_SRTP) && (PJMEDIA_EXTERNAL_SRTP != 0)
+#       include "srtp/srtp.h"
+#   elif (defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0))
+#       include "../../third_party/srtp/include/srtp.h"
+#   endif
+
+#   if defined(SRTP_MAX_TRAILER_LEN)
+#       define PJMEDIA_MAX_VID_PAYLOAD_SIZE     (PJMEDIA_MAX_MTU - \
+                                                 SRTP_MAX_TRAILER_LEN)
+#   else
+#       define PJMEDIA_MAX_VID_PAYLOAD_SIZE     (PJMEDIA_MAX_MTU - 100)
+#   endif
 #endif