Skip to content

Commit c65c2ab

Browse files
committed
Remove compatibility codes
1 parent 57d8e41 commit c65c2ab

File tree

13 files changed

+17
-184
lines changed

13 files changed

+17
-184
lines changed

common/dialer/default.go

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import (
2020
M "github.com/sagernet/sing/common/metadata"
2121
N "github.com/sagernet/sing/common/network"
2222
"github.com/sagernet/sing/service"
23+
24+
"github.com/metacubex/tfo-go"
2325
)
2426

2527
var (
@@ -28,8 +30,8 @@ var (
2830
)
2931

3032
type DefaultDialer struct {
31-
dialer4 tcpDialer
32-
dialer6 tcpDialer
33+
dialer4 tfo.Dialer
34+
dialer6 tfo.Dialer
3335
udpDialer4 net.Dialer
3436
udpDialer6 net.Dialer
3537
udpListener net.ListenConfig
@@ -177,19 +179,10 @@ func NewDefault(ctx context.Context, options option.DialerOptions) (*DefaultDial
177179
udpAddr6 = M.SocksaddrFrom(bindAddr, 0).String()
178180
}
179181
if options.TCPMultiPath {
180-
if !go121Available {
181-
return nil, E.New("MultiPath TCP requires go1.21, please recompile your binary.")
182-
}
183-
setMultiPathTCP(&dialer4)
184-
}
185-
tcpDialer4, err := newTCPDialer(dialer4, options.TCPFastOpen)
186-
if err != nil {
187-
return nil, err
188-
}
189-
tcpDialer6, err := newTCPDialer(dialer6, options.TCPFastOpen)
190-
if err != nil {
191-
return nil, err
182+
dialer4.SetMultipathTCP(true)
192183
}
184+
tcpDialer4 := tfo.Dialer{Dialer: dialer4, DisableTFO: !options.TCPFastOpen}
185+
tcpDialer6 := tfo.Dialer{Dialer: dialer6, DisableTFO: !options.TCPFastOpen}
193186
return &DefaultDialer{
194187
dialer4: tcpDialer4,
195188
dialer6: tcpDialer6,
@@ -269,7 +262,7 @@ func (d *DefaultDialer) DialParallelInterface(ctx context.Context, network strin
269262
}
270263
var dialer net.Dialer
271264
if N.NetworkName(network) == N.NetworkTCP {
272-
dialer = dialerFromTCPDialer(d.dialer4)
265+
dialer = d.dialer4.Dialer
273266
} else {
274267
dialer = d.udpDialer4
275268
}
@@ -317,9 +310,9 @@ func (d *DefaultDialer) ListenPacket(ctx context.Context, destination M.Socksadd
317310

318311
func (d *DefaultDialer) DialerForICMPDestination(destination netip.Addr) net.Dialer {
319312
if !destination.Is6() {
320-
return dialerFromTCPDialer(d.dialer6)
313+
return d.dialer6.Dialer
321314
} else {
322-
return dialerFromTCPDialer(d.dialer4)
315+
return d.dialer4.Dialer
323316
}
324317
}
325318

common/dialer/default_go1.20.go

Lines changed: 0 additions & 19 deletions
This file was deleted.

common/dialer/default_go1.21.go

Lines changed: 0 additions & 11 deletions
This file was deleted.

common/dialer/default_nongo1.20.go

Lines changed: 0 additions & 22 deletions
This file was deleted.

common/dialer/default_nongo1.21.go

Lines changed: 0 additions & 12 deletions
This file was deleted.

common/dialer/tfo.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
//go:build go1.20
2-
31
package dialer
42

53
import (
@@ -32,7 +30,7 @@ type slowOpenConn struct {
3230
err error
3331
}
3432

35-
func DialSlowContext(dialer *tcpDialer, ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
33+
func DialSlowContext(dialer *tfo.Dialer, ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
3634
if dialer.DisableTFO || N.NetworkName(network) != N.NetworkTCP {
3735
switch N.NetworkName(network) {
3836
case N.NetworkTCP, N.NetworkUDP:

common/dialer/tfo_stub.go

Lines changed: 0 additions & 20 deletions
This file was deleted.

common/listener/listener_go121.go

Lines changed: 0 additions & 11 deletions
This file was deleted.

common/listener/listener_go123.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

common/listener/listener_nongo121.go

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)