package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-09-27 11:32:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

client: fix timeout when writing to back channels (#575) (#774)

Browse Source 
Keep alives are now sent when writing to back channels too.
This commit is contained in:
Alessandro Ros
2025-05-04 13:17:53 +02:00
committed by GitHub
parent 7f5aac27d1
commit 2cbdc2a0b7
2 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client.go
View File

@@ -352,8 +352,8 @@ type Client struct {
checkTimeoutTimer *time.Timer
checkTimeoutInitial bool
tcpLastFrameTime *int64
keepalivePeriod time.Duration
keepaliveTimer *time.Timer
keepAlivePeriod time.Duration
keepAliveTimer *time.Timer
closeError error
writer *asyncProcessor
writerMutex sync.RWMutex
@@ -481,8 +481,8 @@ func (c *Client) Start(scheme string, host string) error {
c.ctx = ctx
c.ctxCancel = ctxCancel
c.checkTimeoutTimer = emptyTimer()
c.keepalivePeriod = 30 * time.Second
c.keepaliveTimer = emptyTimer()
c.keepAlivePeriod = 30 * time.Second
c.keepAliveTimer = emptyTimer()
if c.BytesReceived != nil {
c.bytesReceived = c.BytesReceived
@@ -659,12 +659,12 @@ func (c *Client) runInner() error {
}
c.checkTimeoutTimer = time.NewTimer(c.checkTimeoutPeriod)
case <-c.keepaliveTimer.C:
case <-c.keepAliveTimer.C:
err := c.doKeepAlive()
if err != nil {
return err
}
c.keepaliveTimer = time.NewTimer(c.keepalivePeriod)
c.keepAliveTimer = time.NewTimer(c.keepAlivePeriod)
case <-chWriterError:
return c.writer.stopError
@@ -889,9 +889,11 @@ func (c *Client) startTransportRoutines() {
c.tcpBuffer = make([]byte, c.MaxPacketSize+4)
}
if c.state == clientStatePlay && c.stdChannelSetupped {
c.keepaliveTimer = time.NewTimer(c.keepalivePeriod)
if c.state == clientStatePlay {
c.keepAliveTimer = time.NewTimer(c.keepAlivePeriod)
}
if c.state == clientStatePlay && c.stdChannelSetupped {
switch *c.effectiveTransport {
case TransportUDP:
c.checkTimeoutTimer = time.NewTimer(c.InitialUDPReadTimeout)
@@ -918,7 +920,7 @@ func (c *Client) stopTransportRoutines() {
}
c.checkTimeoutTimer = emptyTimer()
c.keepaliveTimer = emptyTimer()
c.keepAliveTimer = emptyTimer()
for _, cm := range c.setuppedMedias {
cm.stop()
@@ -1056,7 +1058,7 @@ func (c *Client) do(req *base.Request, skipResponse bool) (*base.Response, error
c.session = sx.Session
if sx.Timeout != nil && *sx.Timeout > 0 {
c.keepalivePeriod = time.Duration(*sx.Timeout) * time.Second * 8 / 10
c.keepAlivePeriod = time.Duration(*sx.Timeout) * time.Second * 8 / 10
}
}