add inbound option and custom flags

This commit is contained in:
Hiddify
2024-05-29 18:47:04 +02:00
parent ed423fec45
commit 0bbd581277
7 changed files with 54 additions and 13 deletions

View File

@@ -61,6 +61,11 @@ func BuildConfig(opt ConfigOptions, input option.Options) (*option.Options, erro
fmt.Printf("config options: %+v\n", opt)
var options option.Options
if opt.EnableFullConfig {
options.Inbounds = input.Inbounds
options.DNS = input.DNS
options.Route = input.Route
}
directDNSDomains := make(map[string]bool)
dnsRules := []option.DefaultDNSRule{}

View File

@@ -15,7 +15,7 @@ type ConfigOptions struct {
GeoSitePath string `json:"geosite-path"`
Rules []Rule `json:"rules"`
Warp WarpOptions `json:"warp"`
Warp2 WarpOptions `json:"warp"`
Warp2 WarpOptions `json:"warp2"`
Mux MuxOptions `json:"mux"`
TLSTricks TLSTricks `json:"tls-tricks"`
DNSOptions

View File

@@ -134,6 +134,7 @@ func GenerateWarpInfo(license string, oldAccountId string, oldAccessToken string
res += fmt.Sprintf("\nAccount type: %s\n", identity.Account.AccountType)
warpcfg = WarpWireguardConfig{
PrivateKey: identity.PrivateKey,
PeerPublicKey: identity.Config.Peers[0].PublicKey,
LocalAddressIPv4: identity.Config.Interface.Addresses.V4,
LocalAddressIPv6: identity.Config.Interface.Addresses.V6,
ClientID: identity.Config.ClientID,