From 8bafb88bc4039edbb1d8194a6c299808400e7c33 Mon Sep 17 00:00:00 2001 From: "arraykeys@gmail.com" Date: Mon, 16 Oct 2017 20:25:10 +0800 Subject: [PATCH] Signed-off-by: arraykeys@gmail.com --- config.go | 2 +- services/socks.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config.go b/config.go index 6ea413a..190df03 100755 --- a/config.go +++ b/config.go @@ -120,7 +120,7 @@ func initConfig() (err error) { socksArgs.SSHKeyFileSalt = socks.Flag("ssh-keysalt", "salt of ssh private key").Short('s').Default("").String() socksArgs.SSHPassword = socks.Flag("ssh-password", "password for ssh").Short('A').Default("").String() socksArgs.Always = socks.Flag("always", "always use parent proxy").Default("false").Bool() - socksArgs.Timeout = socks.Flag("timeout", "tcp timeout milliseconds when connect to real server or parent proxy").Default("2000").Int() + socksArgs.Timeout = socks.Flag("timeout", "tcp timeout milliseconds when connect to real server or parent proxy").Default("5000").Int() socksArgs.Interval = socks.Flag("interval", "check domain if blocked every interval seconds").Default("10").Int() socksArgs.Blocked = socks.Flag("blocked", "blocked domain file , one domain each line").Default("blocked").Short('b').String() socksArgs.Direct = socks.Flag("direct", "direct domain file , one domain each line").Default("direct").Short('d').String() diff --git a/services/socks.go b/services/socks.go index baf3b70..ee636ad 100644 --- a/services/socks.go +++ b/services/socks.go @@ -283,8 +283,9 @@ func (s *Socks) getOutConn(reqBytes, headBytes []byte, host string) (outConn net } func (s *Socks) ConnectSSH() (err error) { config := ssh.ClientConfig{ - User: *s.cfg.SSHUser, - Auth: []ssh.AuthMethod{s.cfg.SSHAuthMethod}, + Timeout: time.Duration(*s.cfg.Timeout) * time.Millisecond, + User: *s.cfg.SSHUser, + Auth: []ssh.AuthMethod{s.cfg.SSHAuthMethod}, HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error { return nil },