lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

fixed processing none security subscription

Browse Source
This commit is contained in:
Shelikhoo 2023-11-25 17:08:28 +00:00 committed by Xiaokang Wang (Shelikhoo)
parent f112667190
commit a07572822a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/subscription/specs/outbound_parser.go
View File

@ -55,7 +55,7 @@ func (p *OutboundParser) toAbstractServerSpec(config *OutboundConfig) (*ServerCo
} }
serverConfig.TransportSettings = serial.ToTypedMessage(transportSettings) serverConfig.TransportSettings = serial.ToTypedMessage(transportSettings)
} }
{ if config.StreamSetting.Security != "none" {
securitySettings, err := loadHeterogeneousConfigFromRawJSONRestricted( securitySettings, err := loadHeterogeneousConfigFromRawJSONRestricted(
"security", config.StreamSetting.Security, config.StreamSetting.SecuritySettings) "security", config.StreamSetting.Security, config.StreamSetting.SecuritySettings)
if err != nil { if err != nil {
@ -72,7 +72,7 @@ func (p *OutboundParser) toAbstractServerSpec(config *OutboundConfig) (*ServerCo
func (p *OutboundParser) ToSubscriptionServerConfig(config *OutboundConfig) (*SubscriptionServerConfig, error) { func (p *OutboundParser) ToSubscriptionServerConfig(config *OutboundConfig) (*SubscriptionServerConfig, error) {
serverSpec, err := p.toAbstractServerSpec(config) serverSpec, err := p.toAbstractServerSpec(config)
if err != nil { if err != nil {
return nil, newError("unable to parse server specification") return nil, newError("unable to parse server specification").Base(err)
} }
return &SubscriptionServerConfig{ return &SubscriptionServerConfig{
Configuration: serverSpec, Configuration: serverSpec,