Browse Source

add default settings

Shelikhoo 4 years ago
parent
commit
1e306a55e8
2 changed files with 8 additions and 0 deletions
  1. 4 0
      infra/conf/v5cfg/inbound.go
  2. 4 0
      infra/conf/v5cfg/outbound.go

+ 4 - 0
infra/conf/v5cfg/inbound.go

@@ -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 - 0
infra/conf/v5cfg/outbound.go

@@ -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)