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

add TCP suffix to ReadFrameOrRequest / readResponseOrRequest

Browse Source
This commit is contained in:
aler9
2020-10-03 13:32:55 +02:00
parent 7a933fe8f1
commit c65213f7b1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
connclient.go
View File

@@ -166,7 +166,7 @@ func (c *ConnClient) NetConn() net.Conn {
return c.nconn return c.nconn
} }
func (c *ConnClient) readFrameOrResponse() (interface{}, error) { func (c *ConnClient) readFrameTCPOrResponse() (interface{}, error) {
c.nconn.SetReadDeadline(time.Now().Add(c.conf.ReadTimeout)) c.nconn.SetReadDeadline(time.Now().Add(c.conf.ReadTimeout))
b, err := c.br.ReadByte() b, err := c.br.ReadByte()
if err != nil { if err != nil {
@@ -677,7 +677,7 @@ func (c *ConnClient) Play(u *url.URL) (*Response, error) {
// v4lrtspserver sends frames before the response. // v4lrtspserver sends frames before the response.
// ignore them and wait for the response. // ignore them and wait for the response.
for { for {
recv, err := c.readFrameOrResponse() recv, err := c.readFrameTCPOrResponse()
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
connserver.go
View File

@@ -75,8 +75,8 @@ func (s *ConnServer) ReadRequest() (*Request, error) {
return ReadRequest(s.br) return ReadRequest(s.br)
} }
// ReadFrameOrRequest reads an InterleavedFrame or a Request. // ReadFrameTCPOrRequest reads an InterleavedFrame or a Request.
func (s *ConnServer) ReadFrameOrRequest(timeout bool) (interface{}, error) { func (s *ConnServer) ReadFrameTCPOrRequest(timeout bool) (interface{}, error) {
if timeout { if timeout {
s.conf.Conn.SetReadDeadline(time.Now().Add(s.conf.ReadTimeout)) s.conf.Conn.SetReadDeadline(time.Now().Add(s.conf.ReadTimeout))
} }