[asterisk-commits] file: branch file/sha256-a-harsh-reality r417078 - /team/file/sha256-a-harsh-...

[SVN commits to the Asterisk project]

Author: file
Date: Mon Jun 23 09:49:41 2014
New Revision: 417078

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=417078
Log:
Fix a bug where the profile was not of the secure variety.

Modified:
    team/file/sha256-a-harsh-reality/channels/chan_sip.c

Modified: team/file/sha256-a-harsh-reality/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/file/sha256-a-harsh-reality/channels/chan_sip.c?view=diff&rev=417078&r1=417077&r2=417078
==============================================================================
--- team/file/sha256-a-harsh-reality/channels/chan_sip.c (original)
+++ team/file/sha256-a-harsh-reality/channels/chan_sip.c Mon Jun 23 09:49:41 2014
@@ -13076,9 +13076,12 @@
 {
 	struct ast_rtp_engine_dtls *dtls;
 
-	if (!ast_test_flag(&p->flags[2], SIP_PAGE3_FORCE_AVP) && (dtls = ast_rtp_instance_get_dtls(instance))
-		&& dtls->active(instance)) {
-		return ast_test_flag(&p->flags[2], SIP_PAGE3_USE_AVPF) ? "UDP/TLS/RTP/SAVPF" : "UDP/TLS/RTP/SAVP";
+	if ((dtls = ast_rtp_instance_get_dtls(instance)) && dtls->active(instance)) {
+		if (ast_test_flag(&p->flags[2], SIP_PAGE3_FORCE_AVP)) {
+			return ast_test_flag(&p->flags[2], SIP_PAGE3_USE_AVPF) ? "RTP/SAVPF" : "RTP/SAVP";
+		} else {
+			return ast_test_flag(&p->flags[2], SIP_PAGE3_USE_AVPF) ? "UDP/TLS/RTP/SAVPF" : "UDP/TLS/RTP/SAVP";
+		}
 	} else {
 		if (ast_test_flag(&p->flags[2], SIP_PAGE3_USE_AVPF)) {
 			return secure ? "RTP/SAVPF" : "RTP/AVPF";