mirrors/Xray-core
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-06-12 11:29:36 +03:00
Code Issues Releases Activity

Fix tests (#201)

Browse Source 
Co-authored-by: RPRX <63339210+rprx@users.noreply.github.com>
This commit is contained in:
Jim Han
2021-01-30 21:01:20 +08:00
committed by GitHub
parent d032a8deb7
commit 4cd343f2d5
7 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/xray.go
View File

@ -195,11 +195,13 @@ func initInstanceWithConfig(config *Config, server *Instance) (bool, error) {
}
if l >= 17 && s[11:17] == "trojan" || l >= 22 && s[11:22] == "shadowsocks" {
t = true
var m proxyman.SenderConfig
proto.Unmarshal(outbound.SenderSettings.Value, &m)
if m.MultiplexSettings != nil && m.MultiplexSettings.Enabled {
cone = false
break
if outbound.SenderSettings != nil {
var m proxyman.SenderConfig
proto.Unmarshal(outbound.SenderSettings.Value, &m)
if m.MultiplexSettings != nil && m.MultiplexSettings.Enabled {
cone = false
break
}
}
}
}