diff --git a/config/config.go b/config/config.go index 99ecd2c..3506cbf 100644 --- a/config/config.go +++ b/config/config.go @@ -394,6 +394,7 @@ func BuildConfig(opt ConfigOptions, input option.Options) (*option.Options, erro OutboundMainProxyTag = OutboundSelectTag //inbound==warp over proxies //outbound==proxies over warp + fmt.Printf("opt.Warp=%+v\n", opt.Warp) 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) diff --git a/mobile/mobile.go b/mobile/mobile.go index f79e116..d71db74 100644 --- a/mobile/mobile.go +++ b/mobile/mobile.go @@ -11,7 +11,8 @@ import ( ) func Setup() error { - return config.StartGRPCServer(7078) + // return config.StartGRPCServer(7078) + return nil } func Parse(path string, tempPath string, debug bool) error { @@ -44,6 +45,7 @@ func BuildConfig(path string, configOptionsJson string) (string, error) { return "", err } } + return config.BuildConfigJson(*configOptions, options) }