[svn-commits] mjordan: trunk r418174 - in /trunk: ./ res/res_rtp_asterisk.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Tue Jul  8 09:38:42 2014
New Revision: 418174

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418174
Log:
res_rtp_asterisk: Fix undefined function when PJPROJECT is not installed

The dtls_perform_handshake function was mistakenly placed under the guards for
USE_PJPROJECT. If PJPROJECT was not installed, the function would not be
defined, while other functions would attempt to still use it. This prevented
res_rtp_asterisk from being loaded.

ASTERISK-24001 #close
Reported by: Don Fanning
........

Merged revisions 418172 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_rtp_asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_rtp_asterisk.c?view=diff&rev=418174&r1=418173&r2=418174
==============================================================================
--- trunk/res/res_rtp_asterisk.c (original)
+++ trunk/res/res_rtp_asterisk.c Tue Jul  8 09:38:42 2014
@@ -1207,9 +1207,6 @@
 #endif
 };
 
-#ifdef HAVE_PJPROJECT
-static void rtp_learning_seq_init(struct rtp_learning_info *info, uint16_t seq);
-
 #ifdef HAVE_OPENSSL_SRTP
 static void dtls_perform_handshake(struct ast_rtp_instance *instance, struct dtls_details *dtls, int rtcp)
 {
@@ -1232,6 +1229,9 @@
 	dtls_srtp_check_pending(instance, rtp, rtcp);
 }
 #endif
+
+#ifdef HAVE_PJPROJECT
+static void rtp_learning_seq_init(struct rtp_learning_info *info, uint16_t seq);
 
 static void ast_rtp_on_ice_complete(pj_ice_sess *ice, pj_status_t status)
 {