github/v2ray-core
4
0 Fork 0
mirror of https://github.com/v2ray/v2ray-core.git synced 2026-11-09 16:41:14 +00:00
Code Issues Releases Wiki Activity

unified config loader

Browse Source
This commit is contained in:
v2ray committed 2016-06-10 22:26:39 +02:00
1 parent 3f7b70a465
commit e732ba62a6
18 files changed
+257 -215
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

proxy/shadowsocks/config_json.go
+1 -6
View File
@@ -9,7 +9,6 @@ import (
"github.com/v2ray/v2ray-core/common/log"
"github.com/v2ray/v2ray-core/common/protocol"
"github.com/v2ray/v2ray-core/proxy/internal"
"github.com/v2ray/v2ray-core/proxy/internal/config"
)
func (this *Config) UnmarshalJSON(data []byte) error {
@@ -62,9 +61,5 @@ func (this *Config) UnmarshalJSON(data []byte) error {
}
func init() {
config.RegisterInboundConfig("shadowsocks", func(data []byte) (interface{}, error) {
rawConfig := new(Config)
err := json.Unmarshal(data, rawConfig)
return rawConfig, err
})
internal.RegisterInboundConfig("shadowsocks", func() interface{} { return new(Config) })
}