github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

add an option to include JSON loader in v2ray binary.

pull/1086/head
Darien Raymond 2018-04-22 22:54:27 +02:00
parent 9b7551ff1c
commit 97341693f3
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/distro/all/all.go
View File

@ -47,8 +47,11 @@ import (
_ "v2ray.com/core/transport/internet/headers/utp"
_ "v2ray.com/core/transport/internet/headers/wechat"
// JSON config format
// JSON config support. Choose only one from the two below.
// The following line loads JSON from v2ctl
_ "v2ray.com/core/main/json"
// The following line loads JSON internally
// _ "v2ray.com/core/main/jsonem"
// Load config from file or http(s)
_ "v2ray.com/core/main/confloader/external"

15
main/jsonem/jsonem.go Normal file
View File

@ -0,0 +1,15 @@
package jsonem
import (
"v2ray.com/core"
"v2ray.com/core/common"
"v2ray.com/ext/tools/conf/serial"
)
func init() {
common.Must(core.RegisterConfigLoader(&core.ConfigFormat{
Name: "JSON",
Extension: []string{"json"},
Loader: serial.LoadJSONConfig,
}))
}