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

Load Websocket Streamtype from json

pull/238/head
Shelikhoo 2016-08-13 21:42:18 +08:00
parent 0d60d2449a
commit 20f16309e6
No known key found for this signature in database
GPG Key ID: 7791BDB0709ABD21
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
transport/internet/connection_json.go
View File

@ -50,6 +50,9 @@ func (this *StreamSettings) UnmarshalJSON(data []byte) error {
if jsonConfig.Network.HasNetwork(v2net.KCPNetwork) { if jsonConfig.Network.HasNetwork(v2net.KCPNetwork) {
this.Type |= StreamConnectionTypeKCP this.Type |= StreamConnectionTypeKCP
} }
if jsonConfig.Network.HasNetwork(v2net.WSNetwork) {
this.Type |= StreamConnectionTypeWebSocket
}
if jsonConfig.Network.HasNetwork(v2net.TCPNetwork) { if jsonConfig.Network.HasNetwork(v2net.TCPNetwork) {
this.Type |= StreamConnectionTypeTCP this.Type |= StreamConnectionTypeTCP
} }