mirror of
https://github.com/aler9/gortsplib
synced 2025-10-05 07:06:58 +08:00
allow writing primitives to static buffers
This commit is contained in:
@@ -2,7 +2,6 @@ package gortsplib
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
"crypto/tls"
|
||||
"net"
|
||||
"strings"
|
||||
@@ -94,15 +93,13 @@ func TestClientSession(t *testing.T) {
|
||||
conn, err := l.Accept()
|
||||
require.NoError(t, err)
|
||||
br := bufio.NewReader(conn)
|
||||
var bb bytes.Buffer
|
||||
defer conn.Close()
|
||||
|
||||
req, err := readRequest(br)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, base.Options, req.Method)
|
||||
|
||||
bb.Reset()
|
||||
base.Response{
|
||||
byts, _ := base.Response{
|
||||
StatusCode: base.StatusOK,
|
||||
Header: base.Header{
|
||||
"Public": base.HeaderValue{strings.Join([]string{
|
||||
@@ -110,8 +107,8 @@ func TestClientSession(t *testing.T) {
|
||||
}, ", ")},
|
||||
"Session": base.HeaderValue{"123456"},
|
||||
},
|
||||
}.Write(&bb)
|
||||
_, err = conn.Write(bb.Bytes())
|
||||
}.Write()
|
||||
_, err = conn.Write(byts)
|
||||
require.NoError(t, err)
|
||||
|
||||
req, err = readRequest(br)
|
||||
@@ -126,16 +123,15 @@ func TestClientSession(t *testing.T) {
|
||||
tracks := Tracks{track}
|
||||
tracks.setControls()
|
||||
|
||||
bb.Reset()
|
||||
base.Response{
|
||||
byts, _ = base.Response{
|
||||
StatusCode: base.StatusOK,
|
||||
Header: base.Header{
|
||||
"Content-Type": base.HeaderValue{"application/sdp"},
|
||||
"Session": base.HeaderValue{"123456"},
|
||||
},
|
||||
Body: tracks.Write(false),
|
||||
}.Write(&bb)
|
||||
_, err = conn.Write(bb.Bytes())
|
||||
}.Write()
|
||||
_, err = conn.Write(byts)
|
||||
require.NoError(t, err)
|
||||
}()
|
||||
|
||||
@@ -165,23 +161,21 @@ func TestClientAuth(t *testing.T) {
|
||||
conn, err := l.Accept()
|
||||
require.NoError(t, err)
|
||||
br := bufio.NewReader(conn)
|
||||
var bb bytes.Buffer
|
||||
defer conn.Close()
|
||||
|
||||
req, err := readRequest(br)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, base.Options, req.Method)
|
||||
|
||||
bb.Reset()
|
||||
base.Response{
|
||||
byts, _ := base.Response{
|
||||
StatusCode: base.StatusOK,
|
||||
Header: base.Header{
|
||||
"Public": base.HeaderValue{strings.Join([]string{
|
||||
string(base.Describe),
|
||||
}, ", ")},
|
||||
},
|
||||
}.Write(&bb)
|
||||
_, err = conn.Write(bb.Bytes())
|
||||
}.Write()
|
||||
_, err = conn.Write(byts)
|
||||
require.NoError(t, err)
|
||||
|
||||
req, err = readRequest(br)
|
||||
@@ -190,14 +184,13 @@ func TestClientAuth(t *testing.T) {
|
||||
|
||||
v := auth.NewValidator("myuser", "mypass", nil)
|
||||
|
||||
bb.Reset()
|
||||
base.Response{
|
||||
byts, _ = base.Response{
|
||||
StatusCode: base.StatusUnauthorized,
|
||||
Header: base.Header{
|
||||
"WWW-Authenticate": v.Header(),
|
||||
},
|
||||
}.Write(&bb)
|
||||
_, err = conn.Write(bb.Bytes())
|
||||
}.Write()
|
||||
_, err = conn.Write(byts)
|
||||
require.NoError(t, err)
|
||||
|
||||
req, err = readRequest(br)
|
||||
@@ -213,15 +206,14 @@ func TestClientAuth(t *testing.T) {
|
||||
tracks := Tracks{track}
|
||||
tracks.setControls()
|
||||
|
||||
bb.Reset()
|
||||
base.Response{
|
||||
byts, _ = base.Response{
|
||||
StatusCode: base.StatusOK,
|
||||
Header: base.Header{
|
||||
"Content-Type": base.HeaderValue{"application/sdp"},
|
||||
},
|
||||
Body: tracks.Write(false),
|
||||
}.Write(&bb)
|
||||
_, err = conn.Write(bb.Bytes())
|
||||
}.Write()
|
||||
_, err = conn.Write(byts)
|
||||
require.NoError(t, err)
|
||||
}()
|
||||
|
||||
@@ -252,22 +244,20 @@ func TestClientDescribeCharset(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
defer conn.Close()
|
||||
br := bufio.NewReader(conn)
|
||||
var bb bytes.Buffer
|
||||
|
||||
req, err := readRequest(br)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, base.Options, req.Method)
|
||||
|
||||
bb.Reset()
|
||||
base.Response{
|
||||
byts, _ := base.Response{
|
||||
StatusCode: base.StatusOK,
|
||||
Header: base.Header{
|
||||
"Public": base.HeaderValue{strings.Join([]string{
|
||||
string(base.Describe),
|
||||
}, ", ")},
|
||||
},
|
||||
}.Write(&bb)
|
||||
_, err = conn.Write(bb.Bytes())
|
||||
}.Write()
|
||||
_, err = conn.Write(byts)
|
||||
require.NoError(t, err)
|
||||
|
||||
req, err = readRequest(br)
|
||||
@@ -278,16 +268,15 @@ func TestClientDescribeCharset(t *testing.T) {
|
||||
track1, err := NewTrackH264(96, []byte{0x01, 0x02, 0x03, 0x04}, []byte{0x01, 0x02, 0x03, 0x04}, nil)
|
||||
require.NoError(t, err)
|
||||
|
||||
bb.Reset()
|
||||
base.Response{
|
||||
byts, _ = base.Response{
|
||||
StatusCode: base.StatusOK,
|
||||
Header: base.Header{
|
||||
"Content-Type": base.HeaderValue{"application/sdp; charset=utf-8"},
|
||||
"Content-Base": base.HeaderValue{"rtsp://localhost:8554/teststream/"},
|
||||
},
|
||||
Body: Tracks{track1}.Write(false),
|
||||
}.Write(&bb)
|
||||
_, err = conn.Write(bb.Bytes())
|
||||
}.Write()
|
||||
_, err = conn.Write(byts)
|
||||
require.NoError(t, err)
|
||||
}()
|
||||
|
||||
|
Reference in New Issue
Block a user