mirrors/Xray-core
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-06-16 13:27:16 +03:00
Code Issues Releases Activity

Core: Fix memory leaks with RequireFeatures() (#4095)

Browse Source 
Fixes https://github.com/XTLS/Xray-core/issues/4054
Fixes https://github.com/XTLS/Xray-core/issues/3338
Fixes https://github.com/XTLS/Xray-core/issues/3221
This commit is contained in:
yuhan6665
2024-12-10 20:07:52 -05:00
committed by GitHub
parent a2b773135a
commit 0e2304c403
15 changed files with 98 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/observatory/burst/ping.go
View File

@ -6,6 +6,7 @@ import (
"time"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/features/routing"
"github.com/xtls/xray-core/transport/internet/tagged"
)
@ -14,10 +15,10 @@ type pingClient struct {
httpClient *http.Client
}
func newPingClient(ctx context.Context, destination string, timeout time.Duration, handler string) *pingClient {
func newPingClient(ctx context.Context, dispatcher routing.Dispatcher, destination string, timeout time.Duration, handler string) *pingClient {
return &pingClient{
destination: destination,
httpClient: newHTTPClient(ctx, handler, timeout),
httpClient: newHTTPClient(ctx, dispatcher, handler, timeout),
}
}
@ -28,7 +29,7 @@ func newDirectPingClient(destination string, timeout time.Duration) *pingClient
}
}
func newHTTPClient(ctxv context.Context, handler string, timeout time.Duration) *http.Client {
func newHTTPClient(ctxv context.Context, dispatcher routing.Dispatcher, handler string, timeout time.Duration) *http.Client {
tr := &http.Transport{
DisableKeepAlives: true,
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
@ -36,7 +37,7 @@ func newHTTPClient(ctxv context.Context, handler string, timeout time.Duration)
if err != nil {
return nil, err
}
return tagged.Dialer(ctxv, dest, handler)
return tagged.Dialer(ctxv, dispatcher, dest, handler)
},
}
return &http.Client{