[asterisk-commits] res rtp asterisk: rtp->ice check not wrapped in USE PJPROJEC... (asterisk[11])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged.

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


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

Change-Id: I19b49112e1b630bd04e859f14ccf96f8ebd6b151
---
M res/res_rtp_asterisk.c
1 file changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved
  Corey Farrell: Looks good to me, but someone else must approve



diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index 0832bcb..86595a3 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -4720,12 +4720,15 @@
 	 * 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)

-- 
To view, visit https://gerrit.asterisk.org/1850
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I19b49112e1b630bd04e859f14ccf96f8ebd6b151
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>