[asterisk-commits] kmoore: branch kmoore/pjsip_dtls r394605 - in /team/kmoore/pjsip_dtls: includ...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Wed Jul 17 14:53:30 2013
New Revision: 394605

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=394605
Log:
Add new option to handle choosing SRTP tag length

Modified:
    team/kmoore/pjsip_dtls/include/asterisk/res_sip.h
    team/kmoore/pjsip_dtls/res/res_sip.c
    team/kmoore/pjsip_dtls/res/res_sip/sip_configuration.c

Modified: team/kmoore/pjsip_dtls/include/asterisk/res_sip.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pjsip_dtls/include/asterisk/res_sip.h?view=diff&rev=394605&r1=394604&r2=394605
==============================================================================
--- team/kmoore/pjsip_dtls/include/asterisk/res_sip.h (original)
+++ team/kmoore/pjsip_dtls/include/asterisk/res_sip.h Wed Jul 17 14:53:30 2013
@@ -412,6 +412,8 @@
 	unsigned int devicestate_busy_at;
 	/*! \brief DTLS-SRTP configuration information */
 	struct ast_rtp_dtls_cfg dtls_cfg;
+	/*! Should SRTP use a 32 byte tag instead of an 80 byte tag? */
+	unsigned int srtp_tag_32;
 };
 
 /*!

Modified: team/kmoore/pjsip_dtls/res/res_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pjsip_dtls/res/res_sip.c?view=diff&rev=394605&r1=394604&r2=394605
==============================================================================
--- team/kmoore/pjsip_dtls/res/res_sip.c (original)
+++ team/kmoore/pjsip_dtls/res/res_sip.c Wed Jul 17 14:53:30 2013
@@ -463,6 +463,13 @@
 						</enumlist>
 					</description>
 				</configOption>
+				<configOption name="srtp_tag_32">
+					<synopsis>Determines whether 32 byte tags should be used instead of 80 byte tags.</synopsis>
+					<description><para>
+						This option only applies if <replaceable>media_encryption</replaceable> is
+						set to <literal>sdes</literal> or <literal>dtls</literal>.
+					</para></description>
+				</configOption>
 			</configObject>
 			<configObject name="auth">
 				<synopsis>Authentication type</synopsis>

Modified: team/kmoore/pjsip_dtls/res/res_sip/sip_configuration.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pjsip_dtls/res/res_sip/sip_configuration.c?view=diff&rev=394605&r1=394604&r2=394605
==============================================================================
--- team/kmoore/pjsip_dtls/res/res_sip/sip_configuration.c (original)
+++ team/kmoore/pjsip_dtls/res/res_sip/sip_configuration.c Wed Jul 17 14:53:30 2013
@@ -675,6 +675,7 @@
 	ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtlscafile", "", dtls_handler, NULL, 0, 0);
 	ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtlscapath", "", dtls_handler, NULL, 0, 0);
 	ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "dtlssetup", "", dtls_handler, NULL, 0, 0);
+	ast_sorcery_object_field_register(sip_sorcery, "endpoint", "srtp_tag_32", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, srtp_tag_32));
 
 	if (ast_sip_initialize_sorcery_transport(sip_sorcery)) {
 		ast_log(LOG_ERROR, "Failed to register SIP transport support with sorcery\n");