diff options
| author | Kevin Harwell <kharwell@digium.com> | 2015-12-24 10:18:22 -0600 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2015-12-24 10:34:19 -0600 |
| commit | 1e24a0ca8ae075af2814668fc99ecfabb47423b3 (patch) | |
| tree | f62e43df06c040d914955b64d6c4235a505fae90 /res/res_rtp_asterisk.c | |
| parent | 15641cb6cdad4a115145fd4e7aa80ae4c5219b2d (diff) | |
res_rtp_asterisk: rtp->ice check not wrapped in HAVE_PJPROJECT ifdef
Change-Id: I19b49112e1b630bd04e859f14ccf96f8ebd6b151
Diffstat (limited to 'res/res_rtp_asterisk.c')
| -rw-r--r-- | res/res_rtp_asterisk.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index db676f4b7..3c630fbe3 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -4867,12 +4867,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 |