server: remove useless code

This commit is contained in:
aler9
2022-02-19 17:54:11 +01:00
parent 2844e6dfef
commit c7a36478b4
2 changed files with 3 additions and 17 deletions

View File

@@ -127,15 +127,8 @@ func (sc *ServerConn) run() {
return err return err
case ss := <-sc.sessionRemove: case ss := <-sc.sessionRemove:
if _, ok := sc.sessions[ss.secretID]; ok {
delete(sc.sessions, ss.secretID) delete(sc.sessions, ss.secretID)
select {
case ss.connRemove <- sc:
case <-ss.ctx.Done():
}
}
case <-sc.ctx.Done(): case <-sc.ctx.Done():
return liberrors.ErrServerTerminated{} return liberrors.ErrServerTerminated{}
} }

View File

@@ -304,20 +304,13 @@ func (ss *ServerSession) run() {
} }
case sc := <-ss.connRemove: case sc := <-ss.connRemove:
if _, ok := ss.conns[sc]; ok {
delete(ss.conns, sc) delete(ss.conns, sc)
select {
case sc.sessionRemove <- ss:
case <-sc.ctx.Done():
}
}
// if session is not in state RECORD or PLAY, or transport is TCP // if session is not in state RECORD or PLAY, or transport is TCP
if (ss.state != ServerSessionStateRecord && if (ss.state != ServerSessionStateRecord &&
ss.state != ServerSessionStatePlay) || ss.state != ServerSessionStatePlay) ||
*ss.setuppedTransport == TransportTCP { *ss.setuppedTransport == TransportTCP {
// close if there are no associated connections // close session if there are no associated connections
if len(ss.conns) == 0 { if len(ss.conns) == 0 {
return liberrors.ErrServerSessionNotInUse{} return liberrors.ErrServerSessionNotInUse{}
} }