From b8876711f37a5d34e0091befa5cdaad6dcb35da9 Mon Sep 17 00:00:00 2001 From: Kevin Harwell Date: Thu, 24 Dec 2015 10:18:22 -0600 Subject: [PATCH] res_rtp_asterisk: rtp->ice check not wrapped in HAVE_PJPROJECT ifdef Change-Id: I19b49112e1b630bd04e859f14ccf96f8ebd6b151 --- res/res_rtp_asterisk.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 1fb4e1ceb5..3f65f1344d 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -4866,12 +4866,15 @@ static void ast_rtp_remote_address_set(struct ast_rtp_instance *instance, struct * by checking if we're passive. Without this, we only send the pending packets once a new SSL packet is * received in __rtp_recvfrom. If rtp->ice, this is instead done on_ice_complete */ - if (!rtp->ice && rtp->dtls.dtls_setup == AST_RTP_DTLS_SETUP_PASSIVE) { +#ifdef HAVE_PJPROJECT + if (rtp->ice) { + return; + } +#endif + if (rtp->dtls.dtls_setup == AST_RTP_DTLS_SETUP_PASSIVE) { dtls_srtp_flush_pending(instance, rtp); } #endif - - return; } /*! \brief Write t140 redundacy frame -- 2.47.2