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

add read and write timeouts

Browse Source
This commit is contained in:
aler9
2020-01-20 16:37:58 +01:00
parent 70d6541078
commit 1f98d64b23
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
conn.go
View File

@@ -5,47 +5,59 @@ import (
"fmt" "fmt"
"io" "io"
"net" "net"
"time"
)
const (
_READ_DEADLINE = 10 * time.Second
_WRITE_DEADLINE = 10 * time.Second
) )
type Conn struct { type Conn struct {
c net.Conn nconn net.Conn
writeBuf []byte writeBuf []byte
} }
func NewConn(c net.Conn) *Conn { func NewConn(nconn net.Conn) *Conn {
return &Conn{ return &Conn{
c: c, nconn: nconn,
writeBuf: make([]byte, 2048), writeBuf: make([]byte, 2048),
} }
} }
func (c *Conn) Close() error { func (c *Conn) Close() error {
return c.c.Close() return c.nconn.Close()
} }
func (c *Conn) RemoteAddr() net.Addr { func (c *Conn) RemoteAddr() net.Addr {
return c.c.RemoteAddr() return c.nconn.RemoteAddr()
} }
func (c *Conn) ReadRequest() (*Request, error) { func (c *Conn) ReadRequest() (*Request, error) {
return requestDecode(c.c) c.nconn.SetReadDeadline(time.Now().Add(_READ_DEADLINE))
return requestDecode(c.nconn)
} }
func (c *Conn) WriteRequest(req *Request) error { func (c *Conn) WriteRequest(req *Request) error {
return requestEncode(c.c, req) c.nconn.SetWriteDeadline(time.Now().Add(_WRITE_DEADLINE))
return requestEncode(c.nconn, req)
} }
func (c *Conn) ReadResponse() (*Response, error) { func (c *Conn) ReadResponse() (*Response, error) {
return responseDecode(c.c) c.nconn.SetReadDeadline(time.Now().Add(_READ_DEADLINE))
return responseDecode(c.nconn)
} }
func (c *Conn) WriteResponse(res *Response) error { func (c *Conn) WriteResponse(res *Response) error {
return responseEncode(c.c, res) c.nconn.SetWriteDeadline(time.Now().Add(_WRITE_DEADLINE))
return responseEncode(c.nconn, res)
} }
func (c *Conn) ReadInterleavedFrame(frame []byte) (int, int, error) { func (c *Conn) ReadInterleavedFrame(frame []byte) (int, int, error) {
c.nconn.SetReadDeadline(time.Now().Add(_READ_DEADLINE))
var header [4]byte var header [4]byte
_, err := io.ReadFull(c.c, header[:]) _, err := io.ReadFull(c.nconn, header[:])
if err != nil { if err != nil {
return 0, 0, err return 0, 0, err
} }
@@ -64,7 +76,7 @@ func (c *Conn) ReadInterleavedFrame(frame []byte) (int, int, error) {
return 0, 0, fmt.Errorf("frame length greater than 2048") return 0, 0, fmt.Errorf("frame length greater than 2048")
} }
_, err = io.ReadFull(c.c, frame[:framelen]) _, err = io.ReadFull(c.nconn, frame[:framelen])
if err != nil { if err != nil {
return 0, 0, err return 0, 0, err
} }
@@ -73,12 +85,14 @@ func (c *Conn) ReadInterleavedFrame(frame []byte) (int, int, error) {
} }
func (c *Conn) WriteInterleavedFrame(channel int, frame []byte) error { func (c *Conn) WriteInterleavedFrame(channel int, frame []byte) error {
c.nconn.SetWriteDeadline(time.Now().Add(_WRITE_DEADLINE))
c.writeBuf[0] = 0x24 c.writeBuf[0] = 0x24
c.writeBuf[1] = byte(channel) c.writeBuf[1] = byte(channel)
binary.BigEndian.PutUint16(c.writeBuf[2:], uint16(len(frame))) binary.BigEndian.PutUint16(c.writeBuf[2:], uint16(len(frame)))
n := copy(c.writeBuf[4:], frame) n := copy(c.writeBuf[4:], frame)
_, err := c.c.Write(c.writeBuf[:4+n]) _, err := c.nconn.Write(c.writeBuf[:4+n])
if err != nil { if err != nil {
return err return err
} }
@@ -86,5 +100,5 @@ func (c *Conn) WriteInterleavedFrame(channel int, frame []byte) error {
} }
func (c *Conn) Read(buf []byte) (int, error) { func (c *Conn) Read(buf []byte) (int, error) {
return c.c.Read(buf) return c.nconn.Read(buf)
} }