summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-28 12:05:19 -0500
committerMatt A. Tobin <email@mattatobin.com>2020-02-28 12:05:19 -0500
commitb118bab81f89a91c7be92788eb23b6cc95c9eaa5 (patch)
tree6b048fb86c1a1359d62f25724ac1b147fcd9dde4 /media
parentae8eb4d4c42d96c264d5036e1c50e8c1d0d55425 (diff)
downloadUXP-b118bab81f89a91c7be92788eb23b6cc95c9eaa5.tar
UXP-b118bab81f89a91c7be92788eb23b6cc95c9eaa5.tar.gz
UXP-b118bab81f89a91c7be92788eb23b6cc95c9eaa5.tar.lz
UXP-b118bab81f89a91c7be92788eb23b6cc95c9eaa5.tar.xz
UXP-b118bab81f89a91c7be92788eb23b6cc95c9eaa5.zip
Issue #1319 - Remove EARLY_BETA_OR_EARLIER condition
Diffstat (limited to 'media')
-rw-r--r--media/mtransport/nr_socket_prsock.cpp17
1 files changed, 1 insertions, 16 deletions
diff --git a/media/mtransport/nr_socket_prsock.cpp b/media/mtransport/nr_socket_prsock.cpp
index f22229df8..a95ef1029 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.