mirror of
https://github.com/aler9/gortsplib
synced 2025-10-05 15:16:51 +08:00
cleanup code
This commit is contained in:
@@ -115,25 +115,7 @@ func (sc *ServerConn) run() {
|
||||
readDone := make(chan struct{})
|
||||
go sc.runReader(readRequest, readErr, readDone)
|
||||
|
||||
err := func() error {
|
||||
for {
|
||||
select {
|
||||
case req := <-readRequest:
|
||||
req.res <- sc.handleRequestOuter(req.req)
|
||||
|
||||
case err := <-readErr:
|
||||
return err
|
||||
|
||||
case ss := <-sc.sessionRemove:
|
||||
if sc.session == ss {
|
||||
sc.session = nil
|
||||
}
|
||||
|
||||
case <-sc.ctx.Done():
|
||||
return liberrors.ErrServerTerminated{}
|
||||
}
|
||||
}
|
||||
}()
|
||||
err := sc.runInner(readRequest, readErr)
|
||||
|
||||
sc.ctxCancel()
|
||||
|
||||
@@ -160,6 +142,26 @@ func (sc *ServerConn) run() {
|
||||
}
|
||||
}
|
||||
|
||||
func (sc *ServerConn) runInner(readRequest chan readReq, readErr chan error) error {
|
||||
for {
|
||||
select {
|
||||
case req := <-readRequest:
|
||||
req.res <- sc.handleRequestOuter(req.req)
|
||||
|
||||
case err := <-readErr:
|
||||
return err
|
||||
|
||||
case ss := <-sc.sessionRemove:
|
||||
if sc.session == ss {
|
||||
sc.session = nil
|
||||
}
|
||||
|
||||
case <-sc.ctx.Done():
|
||||
return liberrors.ErrServerTerminated{}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var errSwitchReadFunc = errors.New("switch read function")
|
||||
|
||||
func (sc *ServerConn) runReader(readRequest chan readReq, readErr chan error, readDone chan struct{}) {
|
||||
|
Reference in New Issue
Block a user