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

default freedom timeout to 600

pull/330/merge
Darien Raymond 2017-01-27 09:01:39 +01:00
parent ea728d5112
commit 32abea1397
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/conf/freedom.go
View File

@ -12,9 +12,9 @@ import (
) )
type FreedomConfig struct { type FreedomConfig struct {
DomainStrategy string `json:"domainStrategy"` DomainStrategy string `json:"domainStrategy"`
Timeout uint32 `json:"timeout"` Timeout *uint32 `json:"timeout"`
Redirect string `json:"redirect"` Redirect string `json:"redirect"`
} }
func (v *FreedomConfig) Build() (*serial.TypedMessage, error) { func (v *FreedomConfig) Build() (*serial.TypedMessage, error) {
@ -24,7 +24,10 @@ func (v *FreedomConfig) Build() (*serial.TypedMessage, error) {
if domainStrategy == "useip" || domainStrategy == "use_ip" { if domainStrategy == "useip" || domainStrategy == "use_ip" {
config.DomainStrategy = freedom.Config_USE_IP config.DomainStrategy = freedom.Config_USE_IP
} }
config.Timeout = v.Timeout config.Timeout = 600
if v.Timeout != nil {
config.Timeout = *v.Timeout
}
if len(v.Redirect) > 0 { if len(v.Redirect) > 0 {
host, portStr, err := net.SplitHostPort(v.Redirect) host, portStr, err := net.SplitHostPort(v.Redirect)
if err != nil { if err != nil {