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

fix network list build

Browse Source
This commit is contained in:
Darien Raymond 2017-01-13 21:58:18 +01:00
parent 0a91893a26
commit 195594bed0
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/conf/common.go
View File

@ -3,6 +3,7 @@ package conf
import ( import (
"encoding/json" "encoding/json"
"strings" "strings"
"v2ray.com/core/common/errors" "v2ray.com/core/common/errors"
"v2ray.com/core/common/log" "v2ray.com/core/common/log"
v2net "v2ray.com/core/common/net" v2net "v2ray.com/core/common/net"
@ -84,6 +85,12 @@ func (v *NetworkList) UnmarshalJSON(data []byte) error {
} }
func (v *NetworkList) Build() *v2net.NetworkList { func (v *NetworkList) Build() *v2net.NetworkList {
if v == nil {
return &v2net.NetworkList{
Network: []v2net.Network{v2net.Network_TCP},
}
}
list := new(v2net.NetworkList) list := new(v2net.NetworkList)
for _, network := range *v { for _, network := range *v {
list.Network = append(list.Network, network.Build()) list.Network = append(list.Network, network.Build())