bfu/glider-ssh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move channelHandlers to avoid data race (#59)

Browse Source
This commit is contained in:
phil-halley 2018-04-04 11:06:36 -07:00 committed by Jeff Lindsay
parent 47df570d18
commit d6295a6cbc
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server.go
View File

@ -56,10 +56,6 @@ func (srv *Server) ensureHostSigner() error {
}
func (srv *Server) config(ctx Context) *gossh.ServerConfig {
srv.channelHandlers = map[string]channelHandler{
"session": sessionHandler,
"direct-tcpip": directTcpipHandler,
}
config := &gossh.ServerConfig{}
for _, signer := range srv.HostSigners {
config.AddHostKey(signer)
@ -164,6 +160,12 @@ func (srv *Server) Serve(l net.Listener) error {
if srv.Handler == nil {
srv.Handler = DefaultHandler
}
if srv.channelHandlers == nil {
srv.channelHandlers = map[string]channelHandler{
"session": sessionHandler,
"direct-tcpip": directTcpipHandler,
}
}
var tempDelay time.Duration
srv.trackListener(l, true)

4
session_test.go
View File

@ -18,6 +18,10 @@ func (srv *Server) serveOnce(l net.Listener) error {
if e != nil {
return e
}
srv.channelHandlers = map[string]channelHandler{
"session": sessionHandler,
"direct-tcpip": directTcpipHandler,
}
srv.handleConn(conn)
return nil
}