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

client: fix BytesSent / BytesReceived computation (#612) (#654)

Browse Source 
When the TCP transport protocol is in use, BytesSent and BytesReceived
were increased twice.
This commit is contained in:
Alessandro Ros
2024-12-13 20:55:50 +01:00
committed by GitHub
parent 51f00fa828
commit a2df9d83b3
6 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client_media.go
View File

@@ -153,24 +153,20 @@ func (cm *clientMedia) findFormatWithSSRC(ssrc uint32) *clientFormat {
}
func (cm *clientMedia) writePacketRTPInQueueUDP(payload []byte) {
atomic.AddUint64(cm.c.BytesSent, uint64(len(payload)))
cm.udpRTPListener.write(payload) //nolint:errcheck
}
func (cm *clientMedia) writePacketRTCPInQueueUDP(payload []byte) {
atomic.AddUint64(cm.c.BytesSent, uint64(len(payload)))
cm.udpRTCPListener.write(payload) //nolint:errcheck
}
func (cm *clientMedia) writePacketRTPInQueueTCP(payload []byte) {
atomic.AddUint64(cm.c.BytesSent, uint64(len(payload)))
cm.tcpRTPFrame.Payload = payload
cm.c.nconn.SetWriteDeadline(time.Now().Add(cm.c.WriteTimeout))
cm.c.conn.WriteInterleavedFrame(cm.tcpRTPFrame, cm.tcpBuffer) //nolint:errcheck
}
func (cm *clientMedia) writePacketRTCPInQueueTCP(payload []byte) {
atomic.AddUint64(cm.c.BytesSent, uint64(len(payload)))
cm.tcpRTCPFrame.Payload = payload
cm.c.nconn.SetWriteDeadline(time.Now().Add(cm.c.WriteTimeout))
cm.c.conn.WriteInterleavedFrame(cm.tcpRTCPFrame, cm.tcpBuffer) //nolint:errcheck
@@ -264,8 +260,6 @@ func (cm *clientMedia) readRTCPTCPRecord(payload []byte) bool {
func (cm *clientMedia) readRTPUDPPlay(payload []byte) bool {
plen := len(payload)
atomic.AddUint64(cm.c.BytesReceived, uint64(plen))
if plen == (udpMaxPayloadSize + 1) {
cm.c.OnDecodeError(liberrors.ErrClientRTPPacketTooBigUDP{})
return false
@@ -293,8 +287,6 @@ func (cm *clientMedia) readRTCPUDPPlay(payload []byte) bool {
now := cm.c.timeNow()
plen := len(payload)
atomic.AddUint64(cm.c.BytesReceived, uint64(plen))
if plen == (udpMaxPayloadSize + 1) {
cm.c.OnDecodeError(liberrors.ErrClientRTCPPacketTooBigUDP{})
return false
@@ -327,8 +319,6 @@ func (cm *clientMedia) readRTPUDPRecord(_ []byte) bool {
func (cm *clientMedia) readRTCPUDPRecord(payload []byte) bool {
plen := len(payload)
atomic.AddUint64(cm.c.BytesReceived, uint64(plen))
if plen == (udpMaxPayloadSize + 1) {
cm.c.OnDecodeError(liberrors.ErrClientRTCPPacketTooBigUDP{})
return false

5
client_play_test.go
View File

@@ -544,6 +544,11 @@ func TestClientPlay(t *testing.T) {
require.NoError(t, err)
<-packetRecv
require.Greater(t, atomic.LoadUint64(c.BytesSent), uint64(620))
require.Less(t, atomic.LoadUint64(c.BytesSent), uint64(850))
require.Greater(t, atomic.LoadUint64(c.BytesReceived), uint64(580))
require.Less(t, atomic.LoadUint64(c.BytesReceived), uint64(650))
})
}
}

7
client_record_test.go
View File

@@ -7,6 +7,7 @@ import (
"net"
"strings"
"sync"
"sync/atomic"
"testing"
"time"
@@ -334,6 +335,12 @@ func TestClientRecordSerial(t *testing.T) {
require.NoError(t, err)
<-recvDone
require.Greater(t, atomic.LoadUint64(c.BytesSent), uint64(730))
require.Less(t, atomic.LoadUint64(c.BytesSent), uint64(760))
require.Greater(t, atomic.LoadUint64(c.BytesReceived), uint64(180))
require.Less(t, atomic.LoadUint64(c.BytesReceived), uint64(210))
c.Close()
<-done

4
client_udp_listener.go
View File

@@ -173,6 +173,8 @@ func (u *clientUDPListener) run() {
now := u.c.timeNow()
atomic.StoreInt64(u.lastPacketTime, now.Unix())
atomic.AddUint64(u.c.BytesReceived, uint64(n))
if u.readFunc(buf[:n]) {
createNewBuffer()
}
@@ -180,6 +182,8 @@ func (u *clientUDPListener) run() {
}
func (u *clientUDPListener) write(payload []byte) error {
atomic.AddUint64(u.c.BytesSent, uint64(len(payload)))
// no mutex is needed here since Write() has an internal lock.
// https://github.com/golang/go/issues/27203#issuecomment-534386117
u.pc.SetWriteDeadline(time.Now().Add(u.c.WriteTimeout))

18
server_play_test.go
View File

@@ -588,9 +588,9 @@ func TestServerPlaySetupErrorSameUDPPortsAndIP(t *testing.T) {
func TestServerPlay(t *testing.T) {
for _, transport := range []string{
"udp",
"multicast",
"tcp",
"tls",
"multicast",
} {
t.Run(transport, func(t *testing.T) {
var stream *ServerStream
@@ -608,13 +608,25 @@ func TestServerPlay(t *testing.T) {
onConnOpen: func(_ *ServerHandlerOnConnOpenCtx) {
close(nconnOpened)
},
onConnClose: func(_ *ServerHandlerOnConnCloseCtx) {
onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) {
require.Greater(t, ctx.Conn.BytesSent(), uint64(810))
require.Less(t, ctx.Conn.BytesSent(), uint64(1150))
require.Greater(t, ctx.Conn.BytesReceived(), uint64(440))
require.Less(t, ctx.Conn.BytesReceived(), uint64(660))
close(nconnClosed)
},
onSessionOpen: func(_ *ServerHandlerOnSessionOpenCtx) {
close(sessionOpened)
},
onSessionClose: func(_ *ServerHandlerOnSessionCloseCtx) {
onSessionClose: func(ctx *ServerHandlerOnSessionCloseCtx) {
if transport != "multicast" {
require.Greater(t, ctx.Session.BytesSent(), uint64(50))
require.Less(t, ctx.Session.BytesSent(), uint64(60))
require.Greater(t, ctx.Session.BytesReceived(), uint64(15))
require.Less(t, ctx.Session.BytesReceived(), uint64(25))
}
close(sessionClosed)
},
onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) {

14
server_record_test.go
View File

@@ -544,13 +544,23 @@ func TestServerRecord(t *testing.T) {
onConnOpen: func(_ *ServerHandlerOnConnOpenCtx) {
close(nconnOpened)
},
onConnClose: func(_ *ServerHandlerOnConnCloseCtx) {
onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) {
require.Greater(t, ctx.Conn.BytesSent(), uint64(510))
require.Less(t, ctx.Conn.BytesSent(), uint64(560))
require.Greater(t, ctx.Conn.BytesReceived(), uint64(1000))
require.Less(t, ctx.Conn.BytesReceived(), uint64(1200))
close(nconnClosed)
},
onSessionOpen: func(_ *ServerHandlerOnSessionOpenCtx) {
close(sessionOpened)
},
onSessionClose: func(_ *ServerHandlerOnSessionCloseCtx) {
onSessionClose: func(ctx *ServerHandlerOnSessionCloseCtx) {
require.Greater(t, ctx.Session.BytesSent(), uint64(75))
require.Less(t, ctx.Session.BytesSent(), uint64(130))
require.Greater(t, ctx.Session.BytesReceived(), uint64(70))
require.Less(t, ctx.Session.BytesReceived(), uint64(80))
close(sessionClosed)
},
onAnnounce: func(_ *ServerHandlerOnAnnounceCtx) (*base.Response, error) {