From b6aab1ad09d363c7f67e511c84974e99b1c825d1 Mon Sep 17 00:00:00 2001 From: Hiddify Date: Sun, 10 Mar 2024 18:46:40 +0100 Subject: [PATCH] fix: warp setting --- config/config.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/config.go b/config/config.go index 26eab3f..c79ef02 100644 --- a/config/config.go +++ b/config/config.go @@ -150,7 +150,7 @@ func BuildConfig(opt ConfigOptions, input option.Options) (*option.Options, erro AutoRoute: true, StrictRoute: opt.StrictRoute, EndpointIndependentNat: true, - GSO: runtime.GOOS != "windows", + // GSO: runtime.GOOS != "windows", InboundOptions: option.InboundOptions{ SniffEnabled: true, SniffOverrideDestination: true, @@ -396,14 +396,14 @@ func BuildConfig(opt ConfigOptions, input option.Options) (*option.Options, erro OutboundMainProxyTag = OutboundSelectTag //inbound==warp over proxies //outbound==proxies over warp - if opt.Warp.EnableWarp && (opt.Warp.Mode == "inbound" || opt.Warp.Mode == "outbound") { + if opt.Warp.EnableWarp && (opt.Warp.Mode == "warp_over_proxy" || opt.Warp.Mode == "proxy_over_warp") { out, err := generateWarpSingbox(opt.Warp.WireguardConfig.ToWireguardConfig(), opt.Warp.CleanIP, opt.Warp.CleanPort, opt.Warp.FakePackets, opt.Warp.FakePacketSize, opt.Warp.FakePacketDelay) if err != nil { return nil, fmt.Errorf("failed to generate warp config: %v", err) } out.Tag = "Hiddify Warp ✅" - if opt.Warp.Mode == "inbound" { + if opt.Warp.Mode == "warp_over_proxy" { out.WireGuardOptions.Detour = OutboundURLTestTag OutboundMainProxyTag = out.Tag } else { @@ -534,7 +534,7 @@ func BuildConfig(opt ConfigOptions, input option.Options) (*option.Options, erro } func patchHiddifyWarpFromConfig(out option.Outbound, opt ConfigOptions) option.Outbound { - if opt.Warp.EnableWarp && opt.Warp.Mode == "outbound" { + if opt.Warp.EnableWarp && opt.Warp.Mode == "proxy_over_warp" { if out.DirectOptions.Detour == "" { out.DirectOptions.Detour = "Hiddify Warp ✅" }