fix warp

hiddify-com · web-flow · commit 37f334a8323a · 2025-05-08T08:59:39.000+02:00
diff --git a/v2/config/config.go b/v2/config/config.go
@@ -136,7 +136,8 @@ func setOutbounds(options *option.Options, input *option.Options, opt *HiddifyOp
 		}
 	}
 	if opt.Warp.EnableWarp && (opt.Warp.Mode == "warp_over_proxy" || opt.Warp.Mode == "proxy_over_warp") {
-		out, err := GenerateWarpSingbox(opt.Warp.WireguardConfig, opt.Warp.CleanIP, opt.Warp.CleanPort, opt.Warp.FakePackets, opt.Warp.FakePacketSize, opt.Warp.FakePacketDelay, opt.Warp.FakePacketMode)
+		wg := getOrGenerateWarpLocallyIfNeeded(&opt.Warp)
+		out, err := GenerateWarpSingbox(wg, opt.Warp.CleanIP, opt.Warp.CleanPort, opt.Warp.FakePackets, opt.Warp.FakePacketSize, opt.Warp.FakePacketDelay, opt.Warp.FakePacketMode)
 		if err != nil {
 			return fmt.Errorf("failed to generate warp config: %v", err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,8 @@ func setOutbounds(options option.Options, input option.Options, opt *HiddifyOp`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`if opt.Warp.EnableWarp && (opt.Warp.Mode == "warp_over_proxy" \|\| opt.Warp.Mode == "proxy_over_warp") {`
`139`		`- out, err := GenerateWarpSingbox(opt.Warp.WireguardConfig, opt.Warp.CleanIP, opt.Warp.CleanPort, opt.Warp.FakePackets, opt.Warp.FakePacketSize, opt.Warp.FakePacketDelay, opt.Warp.FakePacketMode)`
	`139`	`+ wg := getOrGenerateWarpLocallyIfNeeded(&opt.Warp)`
	`140`	`+ out, err := GenerateWarpSingbox(wg, opt.Warp.CleanIP, opt.Warp.CleanPort, opt.Warp.FakePackets, opt.Warp.FakePacketSize, opt.Warp.FakePacketDelay, opt.Warp.FakePacketMode)`
`140`	`141`	`if err != nil {`
`141`	`142`	`return fmt.Errorf("failed to generate warp config: %v", err)`
`142`	`143`	`}`