root/gost_software
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug #160

Browse Source
This commit is contained in:
rui.zheng 2017-11-01 17:35:01 +08:00
parent d3b5ff2484
commit 7c2a5faae6
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/gost/main.go
View File

@ -214,11 +214,14 @@ func initChain() (*gost.Chain, error) {
) )
interval, _ := strconv.Atoi(node.Values.Get("ping")) interval, _ := strconv.Atoi(node.Values.Get("ping"))
retry, _ := strconv.Atoi(node.Values.Get("retry"))
node.HandshakeOptions = append(node.HandshakeOptions, node.HandshakeOptions = append(node.HandshakeOptions,
gost.AddrHandshakeOption(node.Addr), gost.AddrHandshakeOption(node.Addr),
gost.UserHandshakeOption(node.User), gost.UserHandshakeOption(node.User),
gost.TLSConfigHandshakeOption(tlsCfg), gost.TLSConfigHandshakeOption(tlsCfg),
gost.IntervalHandshakeOption(time.Duration(interval)*time.Second), gost.IntervalHandshakeOption(time.Duration(interval)*time.Second),
gost.TimeoutHandshakeOption(time.Duration(timeout)*time.Second),
gost.RetryHandshakeOption(retry),
) )
node.Client = &gost.Client{ node.Client = &gost.Client{
Connector: connector, Connector: connector,

15
ssh.go
View File

@ -185,7 +185,7 @@ func (tr *sshForwardTransporter) Handshake(conn net.Conn, options ...HandshakeOp
connChan: make(chan net.Conn, 1024), connChan: make(chan net.Conn, 1024),
} }
tr.sessions[opts.Addr] = session tr.sessions[opts.Addr] = session
go session.Ping(opts.Interval, opts.Timeout, 1) go session.Ping(opts.Interval, opts.Timeout, opts.Retry)
go session.waitServer() go session.waitServer()
go session.waitClose() go session.waitClose()
} }
@ -280,7 +280,7 @@ func (tr *sshTunnelTransporter) Handshake(conn net.Conn, options ...HandshakeOpt
deaded: make(chan struct{}), deaded: make(chan struct{}),
} }
tr.sessions[opts.Addr] = session tr.sessions[opts.Addr] = session
go session.Ping(opts.Interval, 30*time.Second, 1) go session.Ping(opts.Interval, opts.Timeout, opts.Retry)
go session.waitServer() go session.waitServer()
go session.waitClose() go session.waitClose()
} }
@ -317,11 +317,16 @@ func (s *sshSession) Ping(interval, timeout time.Duration, retries int) {
return return
} }
if timeout <= 0 { if timeout <= 0 {
timeout = 0 timeout = 10 * time.Second
} }
if retries == 0 {
retries = 1
}
defer close(s.deaded) defer close(s.deaded)
log.Log("[ssh] ping is enabled, interval:", interval) log.Logf("[ssh] ping is enabled, interval: %v, timeout: %v, retry: %d", interval, timeout, retries)
baseCtx := context.Background() baseCtx := context.Background()
t := time.NewTicker(interval) t := time.NewTicker(interval)
defer t.Stop() defer t.Stop()
@ -453,7 +458,7 @@ func (h *sshForwardHandler) handleForward(conn ssh.Conn, chans <-chan ssh.NewCha
case RemoteForwardRequest: case RemoteForwardRequest:
go h.tcpipForwardRequest(conn, req, quit) go h.tcpipForwardRequest(conn, req, quit)
default: default:
// log.Log("[ssh] unknown channel type:", req.Type) // log.Log("[ssh] unknown request type:", req.Type, req.WantReply)
if req.WantReply { if req.WantReply {
req.Reply(false, nil) req.Reply(false, nil)
} }