icybear/sing-box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-next' into dev-next

Browse Source
This commit is contained in:
n3t1zen
2026-02-24 13:00:10 +08:00
parent 38cce206c1 94ed42caf1
commit 920691212c
26 changed files with 541 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
protocol/naive/outbound.go
View File

@@ -235,7 +235,7 @@ func (h *Outbound) DialContext(ctx context.Context, network string, destination
switch N.NetworkName(network) {
case N.NetworkTCP:
h.logger.InfoContext(ctx, "outbound connection to ", destination)
return h.client.DialEarly(destination)
return h.client.DialEarly(ctx, destination)
case N.NetworkUDP:
if h.uotClient == nil {
return nil, E.New("UDP is not supported unless UDP over TCP is enabled")
@@ -267,5 +267,5 @@ type naiveDialer struct {
}
func (d *naiveDialer) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
return d.NaiveClient.DialEarly(destination)
return d.NaiveClient.DialEarly(ctx, destination)
}