chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-08 11:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix wireguard listen_port

Browse Source
This commit is contained in:
世界 2025-04-26 17:25:36 +08:00
parent 67178bbd82
commit 1a9138ae4a
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
option/outbound.go
View File

@ -83,7 +83,6 @@ type DialerOptions struct {
NetworkType badoption.Listable[InterfaceType] `json:"network_type,omitempty"` NetworkType badoption.Listable[InterfaceType] `json:"network_type,omitempty"`
FallbackNetworkType badoption.Listable[InterfaceType] `json:"fallback_network_type,omitempty"` FallbackNetworkType badoption.Listable[InterfaceType] `json:"fallback_network_type,omitempty"`
FallbackDelay badoption.Duration `json:"fallback_delay,omitempty"` FallbackDelay badoption.Duration `json:"fallback_delay,omitempty"`
IsWireGuardListener bool `json:"-"`
// Deprecated: migrated to domain resolver // Deprecated: migrated to domain resolver
DomainStrategy DomainStrategy `json:"domain_strategy,omitempty"` DomainStrategy DomainStrategy `json:"domain_strategy,omitempty"`

4
protocol/wireguard/endpoint.go
View File

@ -45,8 +45,8 @@ func NewEndpoint(ctx context.Context, router adapter.Router, logger log.ContextL
logger: logger, logger: logger,
localAddresses: options.Address, localAddresses: options.Address,
} }
if options.Detour == "" { if options.Detour != "" && options.ListenPort != 0 {
options.IsWireGuardListener = true return nil, E.New("`listen_port` is conflict with `detour`")
} }
outboundDialer, err := dialer.NewWithOptions(dialer.Options{ outboundDialer, err := dialer.NewWithOptions(dialer.Options{
Context: ctx, Context: ctx,

4
protocol/wireguard/outbound.go
View File

@ -46,9 +46,7 @@ func NewOutbound(ctx context.Context, router adapter.Router, logger log.ContextL
logger: logger, logger: logger,
localAddresses: options.LocalAddress, localAddresses: options.LocalAddress,
} }
if options.Detour == "" { if options.Detour != "" && options.GSO {
options.IsWireGuardListener = true
} else if options.GSO {
return nil, E.New("gso is conflict with detour") return nil, E.New("gso is conflict with detour")
} }
outboundDialer, err := dialer.NewWithOptions(dialer.Options{ outboundDialer, err := dialer.NewWithOptions(dialer.Options{