summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-28 12:05:19 -0500
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 13:00:26 +0200
commit8f40737fc7d44857a0cbd283016c19d230646c72 (patch)
tree3d7f2a2345ea333a7af72f95507a8d6e03819fd7 /media
parente7841ab5d740eb70f2975212de4a1066d8714438 (diff)
downloadUXP-8f40737fc7d44857a0cbd283016c19d230646c72.tar
UXP-8f40737fc7d44857a0cbd283016c19d230646c72.tar.gz
UXP-8f40737fc7d44857a0cbd283016c19d230646c72.tar.lz
UXP-8f40737fc7d44857a0cbd283016c19d230646c72.tar.xz
UXP-8f40737fc7d44857a0cbd283016c19d230646c72.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.