From c1f1f8b98e0c1412370fe67d83b1c0ce43a2c18f Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Sun, 29 Jun 2014 20:40:49 +0000 Subject: [PATCH] Check for too many SRTP errors before warning We're checking whether we've hit the warning threshold before checking whether we should just end the call. This causes an off-by-one error where we take one SRTP error more than intended. This commit reverses the order of the tests. --- src/switch_rtp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/switch_rtp.c b/src/switch_rtp.c index 9a6c3cf5e0..eccce9d71c 100644 --- a/src/switch_rtp.c +++ b/src/switch_rtp.c @@ -4808,11 +4808,7 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t if (stat == err_status_replay_fail) msg="replay check failed"; else if (stat == err_status_auth_fail) msg="auth check failed"; else msg=""; - if (errs >= WARN_SRTP_ERRS && !(errs % WARN_SRTP_ERRS)) { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_WARNING, - "SRTP %s unprotect failed with code %d (%s) %ld bytes %d errors\n", - rtp_type(rtp_session), stat, msg, (long)*bytes, errs); - } else if (errs >= MAX_SRTP_ERRS) { + if (errs >= MAX_SRTP_ERRS) { switch_channel_t *channel = switch_core_session_get_channel(rtp_session->session); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_ERROR, "SRTP %s unprotect failed with code %d (%s) %ld bytes %d errors\n", @@ -4820,6 +4816,10 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_ERROR, "Ending call due to SRTP error\n"); switch_channel_hangup(channel, SWITCH_CAUSE_SRTP_READ_ERROR); + } else if (errs >= WARN_SRTP_ERRS && !(errs % WARN_SRTP_ERRS)) { + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_WARNING, + "SRTP %s unprotect failed with code %d (%s) %ld bytes %d errors\n", + rtp_type(rtp_session), stat, msg, (long)*bytes, errs); } } sbytes = 0;