package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-05 15:16:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

server: fix race condition

Browse Source
This commit is contained in:
aler9
2021-05-04 16:05:01 +02:00
committed by Alessandro Ros
parent f2af7489ff
commit 9e618910ac
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
serverconn.go
View File

@@ -175,18 +175,23 @@ func (sc *ServerConn) run() {
sc.tcpFrameWriteBuffer.Close() sc.tcpFrameWriteBuffer.Close()
<-sc.tcpFrameBackgroundWriteDone <-sc.tcpFrameBackgroundWriteDone
} }
sc.nconn.Close() sc.nconn.Close()
sc.s.connClose <- sc sc.s.connClose <- sc
<-sc.terminate <-sc.terminate
return err return err
case <-sc.terminate: case <-sc.terminate:
sc.nconn.Close()
<-readDone
if sc.tcpFrameEnabled { if sc.tcpFrameEnabled {
sc.tcpFrameWriteBuffer.Close() sc.tcpFrameWriteBuffer.Close()
<-sc.tcpFrameBackgroundWriteDone <-sc.tcpFrameBackgroundWriteDone
} }
sc.nconn.Close()
<-readDone
return liberrors.ErrServerTerminated{} return liberrors.ErrServerTerminated{}
} }
}() }()