mirror of
https://github.com/aler9/gortsplib
synced 2025-10-29 01:33:00 +08:00
add TCP suffix to ReadFrameOrRequest / readResponseOrRequest
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
@@ -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))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user