kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-4337 --resolve this actually uncovered a bug cos it was supposed to be rtcp_bytes not bytes

This commit is contained in:
Anthony Minessale 2012-06-23 14:03:06 -05:00
parent cfe435c667
commit a5021fa384
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/switch_rtp.c
View File

@ -1030,7 +1030,7 @@ static int check_srtp_and_ice(switch_rtp_t *rtp_session)
#ifdef ENABLE_ZRTP #ifdef ENABLE_ZRTP
/* ZRTP Send */ /* ZRTP Send */
if (zrtp_on && !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA)) { if (zrtp_on && !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA)) {
unsigned int sbytes = (int) bytes; unsigned int sbytes = (int) rtcp_bytes;
zrtp_status_t stat = zrtp_status_fail; zrtp_status_t stat = zrtp_status_fail;
stat = zrtp_process_rtcp(rtp_session->zrtp_stream, (void *) &rtp_session->rtcp_send_msg, &sbytes); stat = zrtp_process_rtcp(rtp_session->zrtp_stream, (void *) &rtp_session->rtcp_send_msg, &sbytes);
@ -1040,7 +1040,7 @@ static int check_srtp_and_ice(switch_rtp_t *rtp_session)
break; break;
case zrtp_status_drop: case zrtp_status_drop:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat);
ret = (int) bytes; ret = (int)rtcp_bytes;
goto end; goto end;
break; break;
case zrtp_status_fail: case zrtp_status_fail:
@ -1050,7 +1050,7 @@ static int check_srtp_and_ice(switch_rtp_t *rtp_session)
break; break;
} }
bytes = sbytes; rtcp_bytes = sbytes;
} }
#endif #endif
if (switch_socket_sendto(rtp_session->rtcp_sock_output, rtp_session->rtcp_remote_addr, 0, if (switch_socket_sendto(rtp_session->rtcp_sock_output, rtp_session->rtcp_remote_addr, 0,