1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-10-21 16:34:06 -04:00

allow customized timeout in socks protocol

This commit is contained in:
v2ray
2016-07-11 15:46:18 +02:00
parent 96c6012013
commit 566adec285
3 changed files with 7 additions and 1 deletions

View File

@@ -27,6 +27,7 @@ func (this *Config) UnmarshalJSON(data []byte) error {
Accounts []*SocksAccount `json:"accounts"`
UDP bool `json:"udp"`
Host *v2net.AddressJson `json:"ip"`
Timeout int `json:"timeout"`
}
rawConfig := new(SocksConfig)
@@ -55,6 +56,10 @@ func (this *Config) UnmarshalJSON(data []byte) error {
} else {
this.Address = v2net.LocalHostIP
}
if rawConfig.Timeout >= 0 {
this.Timeout = rawConfig.Timeout
}
return nil
}