From: Kevin Harwell <kharwell@digium.com>
Date: Thu, 24 Dec 2015 16:10:53 +0000 (-0600)
Subject: res_rtp_asterisk: rtp->ice check not wrapped in USE_PJPROJECT ifdef
X-Git-Tag: 11.22.0-rc1~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3066b80259c848fd4bf020260cc473a74925a933;p=thirdparty%2Fasterisk.git

res_rtp_asterisk: rtp->ice check not wrapped in USE_PJPROJECT ifdef

Change-Id: I19b49112e1b630bd04e859f14ccf96f8ebd6b151
---

diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index 0832bcb4cd..86595a34bf 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -4720,12 +4720,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 USE_PJPROJECT
+	if (rtp->ice) {
+		return;
+	}
+#endif
+	if (rtp->dtls.dtls_setup == AST_RTP_DTLS_SETUP_PASSIVE) {
 		dtls_srtp_flush_pending(instance, rtp);
 	}
 #endif
-
-	return;
 }
 
 static void ast_rtp_alt_remote_address_set(struct ast_rtp_instance *instance, struct ast_sockaddr *addr)