diff --git a/go.mod b/go.mod index 161a993..f5ed098 100644 --- a/go.mod +++ b/go.mod @@ -20,8 +20,8 @@ require ( github.com/tjfoc/gmsm v1.0.1 // indirect github.com/xtaci/kcp-go v5.0.7+incompatible golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a - golang.org/x/net v0.0.0-20190313220215-9f648a60d977 // indirect - golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f // indirect + golang.org/x/net v0.0.0-20190318221613-d196dffd7c2b // indirect + golang.org/x/sys v0.0.0-20190318195719-6c81ef8f67ca // indirect ) // Replace dependency modules with local developing copy diff --git a/go.sum b/go.sum index 01c4203..643e92c 100644 --- a/go.sum +++ b/go.sum @@ -50,6 +50,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJV golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190313220215-9f648a60d977 h1:actzWV6iWn3GLqN8dZjzsB+CLt+gaV2+wsxroxiQI8I= golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190318221613-d196dffd7c2b h1:ZWpVMTsK0ey5WJCu+vVdfMldWq7/ezaOcjnKWIHWVkE= +golang.org/x/net v0.0.0-20190318221613-d196dffd7c2b/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190302025703-b6889370fb10 h1:xQJI9OEiErEQ++DoXOHqEpzsGMrAv2Q2jyCpi7DmfpQ= golang.org/x/sys v0.0.0-20190302025703-b6889370fb10/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -75,4 +77,6 @@ golang.org/x/sys v0.0.0-20190312061237-fead79001313 h1:pczuHS43Cp2ktBEEmLwScxgjW golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f h1:yCrMx/EeIue0+Qca57bWZS7VX6ymEoypmhWyPhz0NHM= golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190318195719-6c81ef8f67ca h1:o2TLx1bGN3W+Ei0EMU5fShLupLmTOU95KvJJmfYhAzM= +golang.org/x/sys v0.0.0-20190318195719-6c81ef8f67ca/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/proxy/udptun/udptun.go b/proxy/udptun/udptun.go index f170dc6..d8e22c3 100644 --- a/proxy/udptun/udptun.go +++ b/proxy/udptun/udptun.go @@ -75,7 +75,6 @@ func (s *UDPTun) ListenAndServe() { v, ok := nm.Load(raddr.String()) if !ok && v == nil { - pc, _, err = s.dialer.DialUDP("udp", s.taddr) if err != nil { log.F("[udptun] remote dial error: %v", err) diff --git a/strategy/strategy.go b/strategy/strategy.go index 31cde0c..87ebef8 100644 --- a/strategy/strategy.go +++ b/strategy/strategy.go @@ -236,7 +236,7 @@ func (d *Dialer) check(i int) { if readTime > time.Duration(d.config.CheckTimeout)*time.Second { f.Disable() - log.F("[check] %s(%d) -> %s, DISABLED. connect timeout: %s", f.Addr(), f.Priority(), d.config.CheckWebSite, readTime) + log.F("[check] %s(%d) -> %s, DISABLED. check timeout: %s", f.Addr(), f.Priority(), d.config.CheckWebSite, readTime) } else { retry = 2 f.Enable()