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

client: enable keepalives in most cases (#775)

Browse Source
This commit is contained in:
Alessandro Ros
2025-05-04 15:39:07 +02:00
committed by GitHub
parent 2cbdc2a0b7
commit 904b0a1920
5 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client.go
View File

@@ -889,7 +889,8 @@ func (c *Client) startTransportRoutines() {
c.tcpBuffer = make([]byte, c.MaxPacketSize+4)
}
if c.state == clientStatePlay {
// always enable keepalives unless we are recording with TCP
if c.state == clientStatePlay || *c.effectiveTransport != TransportTCP {
c.keepAliveTimer = time.NewTimer(c.keepAlivePeriod)
}

7
client_play_test.go
View File

@@ -432,7 +432,8 @@ func TestClientPlay(t *testing.T) {
require.NoError(t, err2)
for i := 0; i < 2; i++ {
// server -> client (RTP)
// server -> client RTP packet
switch transport {
case "udp":
_, err2 = l1s[i].WriteTo(testRTPPacketMarshaled, &net.UDPAddr{
@@ -456,7 +457,8 @@ func TestClientPlay(t *testing.T) {
require.NoError(t, err2)
}
// client -> server (RTCP)
// client -> server RTCP packet
switch transport {
case "udp", "multicast":
// skip firewall opening
@@ -2874,7 +2876,6 @@ func TestClientPlayDifferentSource(t *testing.T) {
})
require.NoError(t, err2)
// server -> client (RTP)
_, err2 = l1.WriteTo(testRTPPacketMarshaled, &net.UDPAddr{
IP: net.ParseIP("127.0.0.1"),
Port: th.ClientPorts[0],

47
client_record_test.go
View File

@@ -235,6 +235,10 @@ func TestClientRecord(t *testing.T) {
StatusCode: base.StatusOK,
Header: base.Header{
"Transport": th.Marshal(),
"Session": headers.Session{
Session: "ABCDE",
Timeout: uintPtr(1),
}.Marshal(),
},
})
require.NoError(t, err2)
@@ -249,30 +253,49 @@ func TestClientRecord(t *testing.T) {
})
require.NoError(t, err2)
// client -> server (RTP)
var pl []byte
// client -> server RTP packet
if transport == "udp" {
buf := make([]byte, 2048)
var n int
n, _, err2 = l1.ReadFrom(buf)
require.NoError(t, err2)
var pkt rtp.Packet
err2 = pkt.Unmarshal(buf[:n])
require.NoError(t, err2)
require.Equal(t, testRTPPacket, pkt)
pl = buf[:n]
} else {
var f *base.InterleavedFrame
f, err2 = conn.ReadInterleavedFrame()
require.NoError(t, err2)
require.Equal(t, 0, f.Channel)
var pkt rtp.Packet
err2 = pkt.Unmarshal(f.Payload)
require.NoError(t, err2)
require.Equal(t, testRTPPacket, pkt)
pl = f.Payload
}
// server -> client (RTCP)
var pkt rtp.Packet
err2 = pkt.Unmarshal(pl)
require.NoError(t, err2)
require.Equal(t, testRTPPacket, pkt)
// client -> server keepalive (UDP only)
if transport == "udp" {
recv := make(chan struct{})
go func() {
defer close(recv)
req, err2 = conn.ReadRequest()
require.NoError(t, err2)
require.Equal(t, base.Options, req.Method)
}()
select {
case <-recv:
case <-time.After(2 * time.Second):
t.Errorf("should not happen")
}
}
// server -> client RTCP packet
if transport == "udp" {
_, err2 = l2.WriteTo(testRTCPPacketMarshaled, &net.UDPAddr{
IP: net.ParseIP("127.0.0.1"),

5
server_play_test.go
View File

@@ -848,6 +848,7 @@ func TestServerPlay(t *testing.T) {
doPlay(t, conn, "rtsp://"+listenIP+":8554/teststream", session)
// server -> client (direct)
switch transport {
case "udp":
buf := make([]byte, 2048)
@@ -874,6 +875,7 @@ func TestServerPlay(t *testing.T) {
}
// server -> client (through stream)
if transport == "udp" || transport == "multicast" {
buf := make([]byte, 2048)
var n int
@@ -904,7 +906,8 @@ func TestServerPlay(t *testing.T) {
}
}
// client -> server (RTCP)
// client -> server RTCP packet
switch transport {
case "udp":
_, err = l2.WriteTo(testRTCPPacketMarshaled, &net.UDPAddr{

7
server_record_test.go
View File

@@ -728,6 +728,7 @@ func TestServerRecord(t *testing.T) {
}
// server -> client (direct)
if transport == "udp" {
buf := make([]byte, 2048)
var n int
@@ -742,7 +743,8 @@ func TestServerRecord(t *testing.T) {
require.Equal(t, testRTCPPacketMarshaled, f.Payload)
}
// client -> server
// client -> server RTP+RTCP packets
if transport == "udp" {
_, err = l1s[i].WriteTo(testRTPPacketMarshaled, &net.UDPAddr{
IP: net.ParseIP("127.0.0.1"),
@@ -771,7 +773,8 @@ func TestServerRecord(t *testing.T) {
}
for i := 0; i < 2; i++ {
// server -> client (RTCP)
// server -> client RTCP packet
if transport == "udp" {
buf := make([]byte, 2048)
n, _, err := l2s[i].ReadFrom(buf)