External/mediamtx
1
0
Fork 1
mirror of https://github.com/bluenviron/mediamtx.git synced 2025-12-24 20:11:56 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix crash when receiving tcp streams

Browse source
This commit is contained in:
aler9 2020-11-09 22:42:41 +01:00
parent 3461796e40
commit db4fc43f1b
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
internal/client/client.go
View file

@ -1275,6 +1275,7 @@ func (c *Client) runRecordUDP() bool {
c.state = statePreRecord
c.path.OnClientPause(c)
return true
} else {
@ -1308,15 +1309,16 @@ func (c *Client) runRecordUDP() bool {
c.serverUdpRtcp.RemovePublisher(c.ip(), track.rtcpPort, c)
}
c.path.OnClientRemove(c)
c.path = nil
c.log("ERR: no packets received recently (maybe there's a firewall/NAT in between)")
c.conn.Close()
<-readDone
c.path.OnClientRemove(c)
c.path = nil
c.parent.OnClientClose(c)
<-c.terminate
return false
}
}
@ -1337,11 +1339,12 @@ func (c *Client) runRecordUDP() bool {
c.serverUdpRtcp.RemovePublisher(c.ip(), track.rtcpPort, c)
}
c.conn.Close()
<-readDone
c.path.OnClientRemove(c)
c.path = nil
c.conn.Close()
<-readDone
return false
}
}
@ -1393,6 +1396,7 @@ func (c *Client) runRecordTCP() bool {
if err == errStateInitial {
c.state = statePreRecord
c.path.OnClientPause(c)
return true
} else {
@ -1406,6 +1410,7 @@ func (c *Client) runRecordTCP() bool {
c.parent.OnClientClose(c)
<-c.terminate
return false
}
@ -1422,11 +1427,12 @@ func (c *Client) runRecordTCP() bool {
}
}()
c.conn.Close()
<-readDone
c.path.OnClientRemove(c)
c.path = nil
c.conn.Close()
<-readDone
return false
}
}