From c65213f7b19d5c1ecab1825478b64ea458158bfa Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Sat, 3 Oct 2020 13:32:55 +0200 Subject: [PATCH] add TCP suffix to ReadFrameOrRequest / readResponseOrRequest --- connclient.go | 4 ++-- connserver.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/connclient.go b/connclient.go index 36b52957..02a9f24e 100644 --- a/connclient.go +++ b/connclient.go @@ -166,7 +166,7 @@ func (c *ConnClient) NetConn() net.Conn { return c.nconn } -func (c *ConnClient) readFrameOrResponse() (interface{}, error) { +func (c *ConnClient) readFrameTCPOrResponse() (interface{}, error) { c.nconn.SetReadDeadline(time.Now().Add(c.conf.ReadTimeout)) b, err := c.br.ReadByte() if err != nil { @@ -677,7 +677,7 @@ func (c *ConnClient) Play(u *url.URL) (*Response, error) { // v4lrtspserver sends frames before the response. // ignore them and wait for the response. for { - recv, err := c.readFrameOrResponse() + recv, err := c.readFrameTCPOrResponse() if err != nil { return nil, err } diff --git a/connserver.go b/connserver.go index 0232f8f7..e77e3c93 100644 --- a/connserver.go +++ b/connserver.go @@ -75,8 +75,8 @@ func (s *ConnServer) ReadRequest() (*Request, error) { return ReadRequest(s.br) } -// ReadFrameOrRequest reads an InterleavedFrame or a Request. -func (s *ConnServer) ReadFrameOrRequest(timeout bool) (interface{}, error) { +// ReadFrameTCPOrRequest reads an InterleavedFrame or a Request. +func (s *ConnServer) ReadFrameTCPOrRequest(timeout bool) (interface{}, error) { if timeout { s.conf.Conn.SetReadDeadline(time.Now().Add(s.conf.ReadTimeout)) }