Skip to content

change limiter scope to service to allow it to limit traffic correctly #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jolfzverb wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

change limiter scope to service to allow it to limit traffic correctly #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b571a09
change limiter scope to service to allow it to limit traffic correctly
jolfzverb Dec 19, 2025
6c94ce1
revert http2
jolfzverb Dec 24, 2025
f31ba90
revert v4
jolfzverb Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions handler/http/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
)
}

Expand Down Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion handler/socks/v5/bind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
2 changes: 1 addition & 1 deletion handler/socks/v5/connect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
2 changes: 1 addition & 1 deletion handler/socks/v5/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
)
}

Expand Down
2 changes: 1 addition & 1 deletion handler/socks/v5/mbind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
2 changes: 1 addition & 1 deletion handler/socks/v5/udp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down
2 changes: 1 addition & 1 deletion handler/socks/v5/udp_tun.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down