From b118bab81f89a91c7be92788eb23b6cc95c9eaa5 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 28 Feb 2020 12:05:19 -0500 Subject: Issue #1319 - Remove EARLY_BETA_OR_EARLIER condition --- media/mtransport/nr_socket_prsock.cpp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'media') diff --git a/media/mtransport/nr_socket_prsock.cpp b/media/mtransport/nr_socket_prsock.cpp index f22229df86..a95ef10292 100644 --- a/media/mtransport/nr_socket_prsock.cpp +++ b/media/mtransport/nr_socket_prsock.cpp @@ -760,15 +760,7 @@ static int ShouldDrop(size_t len) { nr_socket_short_term_violation_time = TimeStamp::Now(); #endif -// Bug 1013007 -#if !EARLY_BETA_OR_EARLIER return R_WOULDBLOCK; -#else - MOZ_ASSERT(false, - "Short term global rate limit for STUN requests exceeded. Go " - "bug bcampen@mozilla.com if you weren't intentionally " - "spamming ICE candidates, or don't know what that means."); -#endif } if (sustained.getTokens(UINT32_MAX) < len) { @@ -777,15 +769,8 @@ static int ShouldDrop(size_t len) { #ifdef MOZILLA_INTERNAL_API nr_socket_long_term_violation_time = TimeStamp::Now(); #endif -// Bug 1013007 -#if !EARLY_BETA_OR_EARLIER + return R_WOULDBLOCK; -#else - MOZ_ASSERT(false, - "Long term global rate limit for STUN requests exceeded. Go " - "bug bcampen@mozilla.com if you weren't intentionally " - "spamming ICE candidates, or don't know what that means."); -#endif } // Take len tokens from both buckets. -- cgit v1.2.3