diff --git a/common/builder/inbound.go b/common/builder/inbound.go index dc576f9..18e62ee 100644 --- a/common/builder/inbound.go +++ b/common/builder/inbound.go @@ -6,6 +6,7 @@ import ( "encoding/hex" "errors" "fmt" + "github.com/Yuzuki616/V2bX/api/panel" "github.com/Yuzuki616/V2bX/conf" "github.com/goccy/go-json" @@ -52,16 +53,16 @@ func BuildInbound(config *conf.ControllerConfig, nodeInfo *panel.NodeInfo, tag s in.SniffingConfig = sniffingConfig if *in.StreamSetting.Network == "tcp" { if in.StreamSetting.TCPSettings != nil { - in.StreamSetting.TCPSettings.AcceptProxyProtocol = config.EnableProxyProtocol + in.StreamSetting.TCPSettings.AcceptProxyProtocol = config.XrayOptions.EnableProxyProtocol } else { tcpSetting := &coreConf.TCPConfig{ - AcceptProxyProtocol: config.EnableProxyProtocol, + AcceptProxyProtocol: config.XrayOptions.EnableProxyProtocol, } //Enable proxy protocol in.StreamSetting.TCPSettings = tcpSetting } } else if *in.StreamSetting.Network == "ws" { in.StreamSetting.WSSettings = &coreConf.WebSocketConfig{ - AcceptProxyProtocol: config.EnableProxyProtocol} //Enable proxy protocol + AcceptProxyProtocol: config.XrayOptions.EnableProxyProtocol} //Enable proxy protocol } // Set TLS or Reality settings if nodeInfo.Tls { @@ -104,9 +105,9 @@ func BuildInbound(config *conf.ControllerConfig, nodeInfo *panel.NodeInfo, tag s // Support ProxyProtocol for any transport protocol if *in.StreamSetting.Network != "tcp" && *in.StreamSetting.Network != "ws" && - config.EnableProxyProtocol { + config.XrayOptions.EnableProxyProtocol { socketConfig := &coreConf.SocketConfig{ - AcceptProxyProtocol: config.EnableProxyProtocol, + AcceptProxyProtocol: config.XrayOptions.EnableProxyProtocol, TFO: config.XrayOptions.EnableTFO, } //Enable proxy protocol in.StreamSetting.SocketSettings = socketConfig diff --git a/conf/node.go b/conf/node.go index ac1b134..9304ef1 100644 --- a/conf/node.go +++ b/conf/node.go @@ -19,7 +19,6 @@ type ControllerConfig struct { DisableGetRule bool `yaml:"DisableGetRule"` ListenIP string `yaml:"ListenIP"` SendIP string `yaml:"SendIP"` - EnableProxyProtocol bool `yaml:"EnableProxyProtocol"` XrayOptions XrayOptions `yaml:"XrayOptions"` HyOptions HyOptions `yaml:"HyOptions"` LimitConfig LimitConfig `yaml:"LimitConfig"` @@ -27,16 +26,17 @@ type ControllerConfig struct { } type XrayOptions struct { - EnableDNS bool `yaml:"EnableDNS"` - DNSType string `yaml:"DNSType"` - EnableVless bool `yaml:"EnableVless"` - EnableXtls bool `yaml:"EnableXtls"` - EnableUot bool `yaml:"EnableUot"` - EnableTFO bool `yaml:"EnableTFO"` - DisableIVCheck bool `yaml:"DisableIVCheck"` - DisableSniffing bool `yaml:"DisableSniffing"` - EnableFallback bool `yaml:"EnableFallback"` - FallBackConfigs []FallBackConfig `yaml:"FallBackConfigs"` + EnableProxyProtocol bool `yaml:"EnableProxyProtocol"` + EnableDNS bool `yaml:"EnableDNS"` + DNSType string `yaml:"DNSType"` + EnableVless bool `yaml:"EnableVless"` + EnableXtls bool `yaml:"EnableXtls"` + EnableUot bool `yaml:"EnableUot"` + EnableTFO bool `yaml:"EnableTFO"` + DisableIVCheck bool `yaml:"DisableIVCheck"` + DisableSniffing bool `yaml:"DisableSniffing"` + EnableFallback bool `yaml:"EnableFallback"` + FallBackConfigs []FallBackConfig `yaml:"FallBackConfigs"` } type HyOptions struct {