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

server: add tls to publish test

Browse Source
This commit is contained in:
aler9
2021-05-04 16:11:41 +02:00
committed by Alessandro Ros
parent 9e618910ac
commit 2e61bda132
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
server_publish_test.go
View File

@@ -481,6 +481,7 @@ func TestServerPublish(t *testing.T) {
for _, proto := range []string{ for _, proto := range []string{
"udp", "udp",
"tcp", "tcp",
"tls",
} { } {
t.Run(proto, func(t *testing.T) { t.Run(proto, func(t *testing.T) {
connOpened := make(chan struct{}) connOpened := make(chan struct{})
@@ -534,18 +535,31 @@ func TestServerPublish(t *testing.T) {
}, },
} }
if proto == "udp" { switch proto {
case "udp":
s.UDPRTPAddress = "127.0.0.1:8000" s.UDPRTPAddress = "127.0.0.1:8000"
s.UDPRTCPAddress = "127.0.0.1:8001" s.UDPRTCPAddress = "127.0.0.1:8001"
case "tls":
cert, err := tls.X509KeyPair(serverCert, serverKey)
require.NoError(t, err)
s.TLSConfig = &tls.Config{Certificates: []tls.Certificate{cert}}
} }
err := s.Start("127.0.0.1:8554") err := s.Start("127.0.0.1:8554")
require.NoError(t, err) require.NoError(t, err)
defer s.Close() defer s.Close()
conn, err := net.Dial("tcp", "localhost:8554") nconn, err := net.Dial("tcp", "localhost:8554")
require.NoError(t, err) require.NoError(t, err)
defer conn.Close() defer nconn.Close()
conn := func() net.Conn {
if proto == "tls" {
return tls.Client(nconn, &tls.Config{InsecureSkipVerify: true})
}
return nconn
}()
bconn := bufio.NewReadWriter(bufio.NewReader(conn), bufio.NewWriter(conn)) bconn := bufio.NewReadWriter(bufio.NewReader(conn), bufio.NewWriter(conn))
<-connOpened <-connOpened
@@ -990,7 +1004,6 @@ func TestServerPublishErrorTimeout(t *testing.T) {
for _, proto := range []string{ for _, proto := range []string{
"udp", "udp",
"tcp", "tcp",
"tls",
} { } {
t.Run(proto, func(t *testing.T) { t.Run(proto, func(t *testing.T) {
connClosed := make(chan struct{}) connClosed := make(chan struct{})
@@ -1023,15 +1036,9 @@ func TestServerPublishErrorTimeout(t *testing.T) {
ReadTimeout: 1 * time.Second, ReadTimeout: 1 * time.Second,
} }
switch proto { if proto == "udp" {
case "udp":
s.UDPRTPAddress = "127.0.0.1:8000" s.UDPRTPAddress = "127.0.0.1:8000"
s.UDPRTCPAddress = "127.0.0.1:8001" s.UDPRTCPAddress = "127.0.0.1:8001"
case "tls":
cert, err := tls.X509KeyPair(serverCert, serverKey)
require.NoError(t, err)
s.TLSConfig = &tls.Config{Certificates: []tls.Certificate{cert}}
} }
err := s.Start("127.0.0.1:8554") err := s.Start("127.0.0.1:8554")
@@ -1041,14 +1048,7 @@ func TestServerPublishErrorTimeout(t *testing.T) {
nconn, err := net.Dial("tcp", "localhost:8554") nconn, err := net.Dial("tcp", "localhost:8554")
require.NoError(t, err) require.NoError(t, err)
defer nconn.Close() defer nconn.Close()
bconn := bufio.NewReadWriter(bufio.NewReader(nconn), bufio.NewWriter(nconn))
conn := func() net.Conn {
if proto == "tls" {
return tls.Client(nconn, &tls.Config{InsecureSkipVerify: true})
}
return nconn
}()
bconn := bufio.NewReadWriter(bufio.NewReader(conn), bufio.NewWriter(conn))
track, err := NewTrackH264(96, []byte("123456"), []byte("123456")) track, err := NewTrackH264(96, []byte("123456"), []byte("123456"))
require.NoError(t, err) require.NoError(t, err)