lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-21 17:46:58 -05:00
Code Issues Releases Wiki Activity

add default settings

Browse Source
This commit is contained in:
Shelikhoo 2021-09-05 00:42:40 +01:00
parent 8c57d03418
commit 1e306a55e8
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infra/conf/v5cfg/inbound.go
View File

@ -58,6 +58,10 @@ func (c InboundConfig) BuildV5(ctx context.Context) (proto.Message, error) {
receiverSettings.SniffingSettings = s receiverSettings.SniffingSettings = s
} }
if c.Settings == nil {
c.Settings = []byte("{}")
}
inboundConfigPack, err := loadHeterogeneousConfigFromRawJson("inbound", c.Protocol, c.Settings) inboundConfigPack, err := loadHeterogeneousConfigFromRawJson("inbound", c.Protocol, c.Settings)
if err != nil { if err != nil {
return nil, newError("unable to load inbound protocol config").Base(err) return nil, newError("unable to load inbound protocol config").Base(err)

4
infra/conf/v5cfg/outbound.go
View File

@ -40,6 +40,10 @@ func (c OutboundConfig) BuildV5(ctx context.Context) (proto.Message, error) {
senderSettings.MultiplexSettings = c.MuxSettings.Build() senderSettings.MultiplexSettings = c.MuxSettings.Build()
} }
if c.Settings == nil {
c.Settings = []byte("{}")
}
outboundConfigPack, err := loadHeterogeneousConfigFromRawJson("outbound", c.Protocol, c.Settings) outboundConfigPack, err := loadHeterogeneousConfigFromRawJson("outbound", c.Protocol, c.Settings)
if err != nil { if err != nil {
return nil, newError("unable to load outbound protocol config").Base(err) return nil, newError("unable to load outbound protocol config").Base(err)