Simplify ICMPRateLimiter

https://github.com/golang/time/commit/c4c64ca added SetBurst upstream.

PiperOrigin-RevId: 270925077

2 files changed, 3 insertions, 48 deletions

diff --git a/WORKSPACE b/WORKSPACE
index 6f62eb73f..77750f9e6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -196,7 +196,7 @@ go_repository(
 
 go_repository(
     name = "org_golang_x_time",
-    commit = "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef",
+    commit = "c4c64cad1fd0a1a8dab2523e04e61d35308e131e",
     importpath = "golang.org/x/time",
 )
 
diff --git a/pkg/tcpip/stack/icmp_rate_limit.go b/pkg/tcpip/stack/icmp_rate_limit.go
index f8156be47..3a20839da 100644
--- a/pkg/tcpip/stack/icmp_rate_limit.go
+++ b/pkg/tcpip/stack/icmp_rate_limit.go
@@ -15,8 +15,6 @@
 package stack
 
 import (
-	"sync"
-
 	"golang.org/x/time/rate"
 )
 
@@ -33,54 +31,11 @@ const (
 // ICMPRateLimiter is a global rate limiter that controls the generation of
 // ICMP messages generated by the stack.
 type ICMPRateLimiter struct {
-	mu sync.RWMutex
-	l  *rate.Limiter
+	*rate.Limiter
 }
 
 // NewICMPRateLimiter returns a global rate limiter for controlling the rate
 // at which ICMP messages are generated by the stack.
 func NewICMPRateLimiter() *ICMPRateLimiter {
-	return &ICMPRateLimiter{l: rate.NewLimiter(icmpLimit, icmpBurst)}
-}
-
-// Allow returns true if we are allowed to send at least 1 message at the
-// moment.
-func (i *ICMPRateLimiter) Allow() bool {
-	i.mu.RLock()
-	allow := i.l.Allow()
-	i.mu.RUnlock()
-	return allow
-}
-
-// Limit returns the maximum number of ICMP messages that can be sent in one
-// second.
-func (i *ICMPRateLimiter) Limit() rate.Limit {
-	i.mu.RLock()
-	defer i.mu.RUnlock()
-	return i.l.Limit()
-}
-
-// SetLimit sets the maximum number of ICMP messages that can be sent in one
-// second.
-func (i *ICMPRateLimiter) SetLimit(newLimit rate.Limit) {
-	i.mu.RLock()
-	defer i.mu.RUnlock()
-	i.l.SetLimit(newLimit)
-}
-
-// Burst returns how many ICMP messages can be sent at any single instant.
-func (i *ICMPRateLimiter) Burst() int {
-	i.mu.RLock()
-	defer i.mu.RUnlock()
-	return i.l.Burst()
-}
-
-// SetBurst sets the maximum number of ICMP messages allowed at any single
-// instant.
-//
-// NOTE: Changing Burst causes the underlying rate limiter to be recreated.
-func (i *ICMPRateLimiter) SetBurst(burst int) {
-	i.mu.Lock()
-	i.l = rate.NewLimiter(i.l.Limit(), burst)
-	i.mu.Unlock()
+	return &ICMPRateLimiter{Limiter: rate.NewLimiter(icmpLimit, icmpBurst)}
 }