lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-26 03:55:26 -05:00
Code Issues Releases Wiki Activity

refactor multibuffer

Browse Source
This commit is contained in:
Darien Raymond
2018-11-18 19:36:36 +01:00
parent 0f324a613e
commit 842a089dad
19 changed files with 147 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/json/config_json.go
View File

@@ -7,6 +7,7 @@ import (
"v2ray.com/core"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/platform/ctlcmd"
)
@@ -19,7 +20,9 @@ func init() {
if err != nil {
return nil, newError("failed to execute v2ctl to convert config file.").Base(err).AtWarning()
}
return core.LoadConfig("protobuf", "", &jsonContent)
return core.LoadConfig("protobuf", "", &buf.MultiBufferContainer{
MultiBuffer: jsonContent,
})
},
}))
}