diff --git a/handler/http/handler.go b/handler/http/handler.go index ab37c80e..456761e3 100644 --- a/handler/http/handler.go +++ b/handler/http/handler.go @@ -93,7 +93,7 @@ func (h *httpHandler) Init(md md.Metadata) error { h.limiter = cache_limiter.NewCachedTrafficLimiter(h.options.Limiter, cache_limiter.RefreshIntervalOption(h.md.limiterRefreshInterval), cache_limiter.CleanupIntervalOption(h.md.limiterCleanupInterval), - cache_limiter.ScopeOption(limiter.ScopeClient), + cache_limiter.ScopeOption(limiter.ScopeService), ) } @@ -317,7 +317,7 @@ func (h *httpHandler) handleRequest(ctx context.Context, conn net.Conn, req *htt h.limiter, conn, clientID, - limiter.ScopeOption(limiter.ScopeClient), + limiter.ScopeOption(limiter.ScopeService), limiter.ServiceOption(h.options.Service), limiter.NetworkOption(network), limiter.AddrOption(addr), diff --git a/handler/socks/v5/bind.go b/handler/socks/v5/bind.go index ec0894f6..1f8db098 100644 --- a/handler/socks/v5/bind.go +++ b/handler/socks/v5/bind.go @@ -38,7 +38,7 @@ func (h *socks5Handler) handleBind(ctx context.Context, conn net.Conn, network, conn, string(clientID), limiter.ServiceOption(h.options.Service), - limiter.ScopeOption(limiter.ScopeClient), + limiter.ScopeOption(limiter.ScopeService), limiter.NetworkOption(network), limiter.AddrOption(address), limiter.ClientOption(string(clientID)), diff --git a/handler/socks/v5/connect.go b/handler/socks/v5/connect.go index 93163207..af17fd35 100644 --- a/handler/socks/v5/connect.go +++ b/handler/socks/v5/connect.go @@ -37,7 +37,7 @@ func (h *socks5Handler) handleConnect(ctx context.Context, conn net.Conn, networ conn, string(clientID), limiter.ServiceOption(h.options.Service), - limiter.ScopeOption(limiter.ScopeClient), + limiter.ScopeOption(limiter.ScopeService), limiter.NetworkOption(network), limiter.AddrOption(address), limiter.ClientOption(string(clientID)), diff --git a/handler/socks/v5/handler.go b/handler/socks/v5/handler.go index 4f364a2b..8e17a66c 100644 --- a/handler/socks/v5/handler.go +++ b/handler/socks/v5/handler.go @@ -81,7 +81,7 @@ func (h *socks5Handler) Init(md md.Metadata) (err error) { h.limiter = cache_limiter.NewCachedTrafficLimiter(h.options.Limiter, cache_limiter.RefreshIntervalOption(h.md.limiterRefreshInterval), cache_limiter.CleanupIntervalOption(h.md.limiterCleanupInterval), - cache_limiter.ScopeOption(limiter.ScopeClient), + cache_limiter.ScopeOption(limiter.ScopeService), ) } diff --git a/handler/socks/v5/mbind.go b/handler/socks/v5/mbind.go index 2dc0f126..43da6d01 100644 --- a/handler/socks/v5/mbind.go +++ b/handler/socks/v5/mbind.go @@ -39,7 +39,7 @@ func (h *socks5Handler) handleMuxBind(ctx context.Context, conn net.Conn, networ conn, string(clientID), limiter.ServiceOption(h.options.Service), - limiter.ScopeOption(limiter.ScopeClient), + limiter.ScopeOption(limiter.ScopeService), limiter.NetworkOption(network), limiter.AddrOption(address), limiter.ClientOption(string(clientID)), diff --git a/handler/socks/v5/udp.go b/handler/socks/v5/udp.go index eafaff38..90f89e12 100644 --- a/handler/socks/v5/udp.go +++ b/handler/socks/v5/udp.go @@ -107,7 +107,7 @@ func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn, network st h.limiter, string(clientID), limiter.ServiceOption(h.options.Service), - limiter.ScopeOption(limiter.ScopeClient), + limiter.ScopeOption(limiter.ScopeService), limiter.NetworkOption(network), limiter.ClientOption(string(clientID)), limiter.SrcOption(conn.RemoteAddr().String()), diff --git a/handler/socks/v5/udp_tun.go b/handler/socks/v5/udp_tun.go index 1d95f8c9..c9357415 100644 --- a/handler/socks/v5/udp_tun.go +++ b/handler/socks/v5/udp_tun.go @@ -34,7 +34,7 @@ func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, network conn, string(clientID), limiter.ServiceOption(h.options.Service), - limiter.ScopeOption(limiter.ScopeClient), + limiter.ScopeOption(limiter.ScopeService), limiter.NetworkOption(network), limiter.AddrOption(address), limiter.ClientOption(string(clientID)),