]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
res_rtp_asterisk: rtp->ice check not wrapped in USE_PJPROJECT ifdef 50/1850/2
authorKevin Harwell <kharwell@digium.com>
Thu, 24 Dec 2015 16:10:53 +0000 (10:10 -0600)
committerKevin Harwell <kharwell@digium.com>
Thu, 24 Dec 2015 16:33:55 +0000 (10:33 -0600)
Change-Id: I19b49112e1b630bd04e859f14ccf96f8ebd6b151

res/res_rtp_asterisk.c

index 0832bcb4cdff71fc7a2d8e9d09f8d2a548cae243..86595a34bfd759e1961ba31ea0073bcd117d668c 100644 (file)
@@ -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)