提交 013fb1d2 authored 作者: Anthony Minessale II's avatar Anthony Minessale II

Merge pull request #652 in FS/freeswitch from…

Merge pull request #652 in FS/freeswitch from ~SJTHOMASON/freeswitch:bugfix/FS-8571-configure-with-disable-srtp-breaks to master

* commit 'e3e6bd87':
  Add missing ENABLE_SRTP ifdef to allow building without SRTP
...@@ -5261,6 +5261,7 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t ...@@ -5261,6 +5261,7 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
if (rtp_session->has_rtcp) { if (rtp_session->has_rtcp) {
*flags |= SFF_RTCP; *flags |= SFF_RTCP;
#ifdef ENABLE_SRTP
if (rtp_session->flags[SWITCH_RTP_FLAG_SECURE_RECV]) { if (rtp_session->flags[SWITCH_RTP_FLAG_SECURE_RECV]) {
int sbytes = (int) *bytes; int sbytes = (int) *bytes;
err_status_t stat = 0; err_status_t stat = 0;
...@@ -5275,7 +5276,7 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t ...@@ -5275,7 +5276,7 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
*bytes = sbytes; *bytes = sbytes;
} }
#endif
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论