self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-22 18:23:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code review gone wrong...

Browse source 
Fixes #400

Accidentally copy/pasted the channel into the wrong struct (session vs
party) when implementing PR suggestions
This commit is contained in:
Ev Kontsevoy 2016-05-08 21:57:34 -07:00
parent b3bde057b2
commit 331b725e9e
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/srv/sess.go
View file

@ -322,7 +322,6 @@ func newSession(id rsession.ID, r *sessionRegistry, context *ctx) (*session, err
login: context.login,
closeC: make(chan bool),
lingerTTL: defaults.SessionLingerTTL,
termSizeC: make(chan []byte, 2),
}
return sess, nil
}
@ -356,13 +355,11 @@ func (p *party) termSizePusher(ch ssh.Channel) {
log.Error(err)
}
}()
defer close(p.termSizeC)
for err == nil {
select {
case newSize := <-p.termSizeC:
n, err = ch.Write(newSize)
log.Infof("Pushed size: %s, (written=%d, err=%v)", string(newSize), n, err)
if err == io.EOF {
continue
}
@ -758,15 +755,16 @@ func (m *multiWriter) Write(p []byte) (n int, err error) {
func newParty(s *session, ch ssh.Channel, ctx *ctx) *party {
return &party{
user: ctx.teleportUser,
serverID: s.registry.srv.ID(),
site: ctx.conn.RemoteAddr().String(),
id: rsession.NewID(),
ch: ch,
ctx: ctx,
s: s,
sconn: ctx.conn,
closeC: make(chan bool),
user: ctx.teleportUser,
serverID: s.registry.srv.ID(),
site: ctx.conn.RemoteAddr().String(),
id: rsession.NewID(),
ch: ch,
ctx: ctx,
s: s,
sconn: ctx.conn,
termSizeC: make(chan []byte, 5),
closeC: make(chan bool),
}
}
@ -833,6 +831,7 @@ func (p *party) Close() (err error) {
p.ctx.Error(err)
}
close(p.closeC)
close(p.termSizeC)
})
return err
}