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

add pointers to all Read() methods

Browse Source
This commit is contained in:
aler9
2020-12-16 11:33:49 +01:00
parent 2be3fac239
commit 0aaf4d45d8
4 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/base/content.go
View File

@@ -7,36 +7,39 @@ import (
"strconv" "strconv"
) )
func contentRead(rb *bufio.Reader, header Header) ([]byte, error) { type content []byte
func (c *content) read(rb *bufio.Reader, header Header) error {
cls, ok := header["Content-Length"] cls, ok := header["Content-Length"]
if !ok || len(cls) != 1 { if !ok || len(cls) != 1 {
return nil, nil *c = nil
return nil
} }
cl, err := strconv.ParseInt(cls[0], 10, 64) cl, err := strconv.ParseInt(cls[0], 10, 64)
if err != nil { if err != nil {
return nil, fmt.Errorf("invalid Content-Length") return fmt.Errorf("invalid Content-Length")
} }
if cl > rtspMaxContentLength { if cl > rtspMaxContentLength {
return nil, fmt.Errorf("Content-Length exceeds %d", rtspMaxContentLength) return fmt.Errorf("Content-Length exceeds %d", rtspMaxContentLength)
} }
ret := make([]byte, cl) *c = make([]byte, cl)
n, err := io.ReadFull(rb, ret) n, err := io.ReadFull(rb, *c)
if err != nil && n != len(ret) { if err != nil && n != len(*c) {
return nil, err return err
} }
return ret, nil return nil
} }
func contentWrite(bw *bufio.Writer, content []byte) error { func (c content) write(bw *bufio.Writer) error {
if len(content) == 0 { if len(c) == 0 {
return nil return nil
} }
_, err := bw.Write(content) _, err := bw.Write(c)
if err != nil { if err != nil {
return err return err
} }

8
pkg/base/header.go
View File

@@ -34,7 +34,9 @@ type HeaderValue []string
// Header is a RTSP reader, present in both Requests and Responses. // Header is a RTSP reader, present in both Requests and Responses.
type Header map[string]HeaderValue type Header map[string]HeaderValue
func (h Header) read(rb *bufio.Reader) error { func (h *Header) read(rb *bufio.Reader) error {
*h = make(Header)
for { for {
byt, err := rb.ReadByte() byt, err := rb.ReadByte()
if err != nil { if err != nil {
@@ -50,7 +52,7 @@ func (h Header) read(rb *bufio.Reader) error {
break break
} }
if len(h) >= headerMaxEntryCount { if len(*h) >= headerMaxEntryCount {
return fmt.Errorf("headers count exceeds %d", headerMaxEntryCount) return fmt.Errorf("headers count exceeds %d", headerMaxEntryCount)
} }
@@ -91,7 +93,7 @@ func (h Header) read(rb *bufio.Reader) error {
return err return err
} }
h[key] = append(h[key], val) (*h)[key] = append((*h)[key], val)
} }
return nil return nil

5
pkg/base/request.go
View File

@@ -94,13 +94,12 @@ func (req *Request) Read(rb *bufio.Reader) error {
return err return err
} }
req.Header = make(Header)
err = req.Header.read(rb) err = req.Header.read(rb)
if err != nil { if err != nil {
return err return err
} }
req.Content, err = contentRead(rb, req.Header) err = (*content)(&req.Content).read(rb, req.Header)
if err != nil { if err != nil {
return err return err
} }
@@ -125,7 +124,7 @@ func (req Request) Write(bw *bufio.Writer) error {
return err return err
} }
err = contentWrite(bw, req.Content) err = content(req.Content).write(bw)
if err != nil { if err != nil {
return err return err
} }

5
pkg/base/response.go
View File

@@ -172,13 +172,12 @@ func (res *Response) Read(rb *bufio.Reader) error {
return err return err
} }
res.Header = make(Header)
err = res.Header.read(rb) err = res.Header.read(rb)
if err != nil { if err != nil {
return err return err
} }
res.Content, err = contentRead(rb, res.Header) err = (*content)(&res.Content).read(rb, res.Header)
if err != nil { if err != nil {
return err return err
} }
@@ -208,7 +207,7 @@ func (res Response) Write(bw *bufio.Writer) error {
return err return err
} }
err = contentWrite(bw, res.Content) err = content(res.Content).write(bw)
if err != nil { if err != nil {
return err return err
} }