hesoyam/sing-box-extended-mirror
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-10-20 16:24:25 +00:00
Code Issues Packages Projects Releases 2 Wiki Activity

masque: Add L4 proxy mode and handshake timeout

Browse Source
This commit is contained in:
Shtorm
2026-10-19 17:05:38 +03:00
parent b2bb7bf347
commit dee34e0300
8 changed files with 312 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protocol/masque/outbound.go
+39 -13
View File
@@ -33,21 +33,30 @@ func RegisterOutbound(registry *outbound.Registry) {
outbound.Register[option.MASQUEOutboundOptions](registry, C.TypeMASQUE, NewOutbound)
}
type tunnelClient interface {
N.Dialer
Close() error
}
type Outbound struct {
outbound.Adapter
ctx context.Context
dnsRouter adapter.DNSRouter
logger logger.ContextLogger
options option.MASQUEOutboundOptions
tunnel *masque.Tunnel
client tunnelClient
startHandler func()
await chan struct{}
}
func NewOutbound(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.MASQUEOutboundOptions) (adapter.Outbound, error) {
networks := []string{N.NetworkTCP, N.NetworkUDP}
if options.UseL4Proxy {
networks = []string{N.NetworkTCP}
}
outbound := &Outbound{
Adapter: outbound.NewAdapterWithDialerOptions(C.TypeMASQUE, tag, []string{N.NetworkTCP, N.NetworkUDP}, options.DialerOptions),
Adapter: outbound.NewAdapterWithDialerOptions(C.TypeMASQUE, tag, networks, options.DialerOptions),
ctx: ctx,
dnsRouter: service.FromContext[adapter.DNSRouter](ctx),
logger: logger,
@@ -103,6 +112,9 @@ func NewOutbound(ctx context.Context, router adapter.Router, logger log.ContextL
return
}
serverName := cloudflare.ConnectSNI
if options.UseL4Proxy {
serverName = cloudflare.L4ConnectSNI
}
if options.TLS != nil && options.TLS.ServerName != "" {
serverName = options.TLS.ServerName
}
@@ -111,6 +123,7 @@ func NewOutbound(ctx context.Context, router adapter.Router, logger log.ContextL
logger.ErrorContext(ctx, E.New("failed to prepare TLS config: ", err))
return
}
useHTTP2 := options.UseHTTP2 && !options.UseL4Proxy
var endpoint net.Addr
if options.Address != "" {
endpointPort := options.Port
@@ -122,13 +135,13 @@ func NewOutbound(ctx context.Context, router adapter.Router, logger log.ContextL
logger.ErrorContext(ctx, E.New("invalid endpoint address: ", options.Address))
return
}
if options.UseHTTP2 {
if useHTTP2 {
endpoint = &net.TCPAddr{IP: endpointIP, Port: int(endpointPort)}
} else {
endpoint = &net.UDPAddr{IP: endpointIP, Port: int(endpointPort)}
}
} else {
endpoint, err = appConfig.SelectEndpointFromConfig(options.UseHTTP2, options.UseIPv6, 443)
endpoint, err = appConfig.SelectEndpointFromConfig(useHTTP2, options.UseIPv6, 443)
if err != nil {
logger.ErrorContext(ctx, E.New("failed to select endpoint: ", err))
return
@@ -165,6 +178,18 @@ func NewOutbound(ctx context.Context, router adapter.Router, logger log.ContextL
logger.ErrorContext(ctx, err)
return
}
if options.UseL4Proxy {
outbound.client = masque.NewL4Client(logger, masque.L4ClientOptions{
Dialer: outboundDialer,
TLSConfig: tlsConfig,
Endpoint: endpoint,
UDPKeepalivePeriod: udpKeepalivePeriod,
UDPInitialPacketSize: options.UDPInitialPacketSize,
HandshakeTimeout: time.Duration(options.HandshakeTimeout),
CongestionControl: congestionControl,
})
return
}
tunnel, err := masque.NewTunnel(
ctx,
logger,
@@ -191,6 +216,7 @@ func NewOutbound(ctx context.Context, router adapter.Router, logger log.ContextL
UDPKeepalivePeriod: udpKeepalivePeriod,
UDPInitialPacketSize: options.UDPInitialPacketSize,
ReconnectDelay: options.ReconnectDelay.Build(),
HandshakeTimeout: time.Duration(options.HandshakeTimeout),
CongestionControl: congestionControl,
},
)
@@ -198,12 +224,12 @@ func NewOutbound(ctx context.Context, router adapter.Router, logger log.ContextL
logger.ErrorContext(ctx, err)
return
}
outbound.tunnel = tunnel
if err = outbound.tunnel.Start(false); err != nil {
outbound.client = tunnel
if err = tunnel.Start(false); err != nil {
logger.ErrorContext(ctx, err)
return
}
if err = outbound.tunnel.Start(true); err != nil {
if err = tunnel.Start(true); err != nil {
logger.ErrorContext(ctx, err)
return
}
@@ -219,7 +245,7 @@ func (w *Outbound) Start(stage adapter.StartStage, scope *adapter.Scope) error {
if err := w.isTunnelInitialized(w.ctx); err != nil {
return err
}
return w.tunnel.Close()
return w.client.Close()
})
go w.startHandler()
return nil
@@ -240,11 +266,11 @@ func (w *Outbound) DialContext(ctx context.Context, network string, destination
if err != nil {
return nil, err
}
return N.DialSerial(ctx, w.tunnel, network, destination, destinationAddresses)
return N.DialSerial(ctx, w.client, network, destination, destinationAddresses)
} else if !destination.Addr.IsValid() {
return nil, E.New("invalid destination: ", destination)
}
return w.tunnel.DialContext(ctx, network, destination)
return w.client.DialContext(ctx, network, destination)
}
func (w *Outbound) ListenPacketWithDestination(ctx context.Context, destination M.Socksaddr) (net.PacketConn, netip.Addr, error) {
@@ -257,9 +283,9 @@ func (w *Outbound) ListenPacketWithDestination(ctx context.Context, destination
if err != nil {
return nil, netip.Addr{}, err
}
return N.ListenSerial(ctx, w.tunnel, destination, destinationAddresses)
return N.ListenSerial(ctx, w.client, destination, destinationAddresses)
}
packetConn, err := w.tunnel.ListenPacket(ctx, destination)
packetConn, err := w.client.ListenPacket(ctx, destination)
if err != nil {
return nil, netip.Addr{}, err
}
@@ -286,7 +312,7 @@ func (w *Outbound) isTunnelInitialized(ctx context.Context) error {
case <-ctx.Done():
return ctx.Err()
}
if w.tunnel == nil {
if w.client == nil {
return E.New("tunnel not initialized")
}
return nil