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

fix tests

Browse Source
This commit is contained in:
aler9
2022-02-19 15:53:37 +01:00
parent 7f799ffea8
commit 2844e6dfef
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server_read_test.go
View File

@@ -470,13 +470,6 @@ func TestServerRead(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, base.StatusOK, res.StatusCode) require.Equal(t, base.StatusOK, res.StatusCode)
// skip firewall opening
if transport == "udp" {
buf := make([]byte, 2048)
_, _, err := l2.ReadFrom(buf)
require.NoError(t, err)
}
// server -> client (direct) // server -> client (direct)
switch transport { switch transport {
case "udp": case "udp":
@@ -504,6 +497,13 @@ func TestServerRead(t *testing.T) {
} }
} }
// skip firewall opening
if transport == "udp" {
buf := make([]byte, 2048)
_, _, err := l2.ReadFrom(buf)
require.NoError(t, err)
}
// server -> client (through stream) // server -> client (through stream)
if transport == "udp" || transport == "multicast" { if transport == "udp" || transport == "multicast" {
buf := make([]byte, 2048) buf := make([]byte, 2048)

10
serversession.go
View File

@@ -868,9 +868,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
sc.s.udpRTCPListener.addClient(ss.author.ip(), track.udpRTCPPort, ss, trackID, false) sc.s.udpRTCPListener.addClient(ss.author.ip(), track.udpRTCPPort, ss, trackID, false)
// open the firewall by sending packets to the counterpart // open the firewall by sending packets to the counterpart
byts, _ := (&rtcp.ReceiverReport{}).Marshal() ss.WritePacketRTCP(trackID, &rtcp.ReceiverReport{})
ss.s.udpRTCPListener.write(byts,
ss.setuppedTracks[trackID].udpRTCPAddr)
} }
case TransportUDPMulticast: case TransportUDPMulticast:
@@ -998,10 +996,8 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
ss.s.udpRTCPListener.addClient(ss.author.ip(), track.udpRTCPPort, ss, trackID, true) ss.s.udpRTCPListener.addClient(ss.author.ip(), track.udpRTCPPort, ss, trackID, true)
// open the firewall by sending packets to the counterpart // open the firewall by sending packets to the counterpart
byts, _ := (&rtp.Packet{Header: rtp.Header{Version: 2}}).Marshal() ss.WritePacketRTP(trackID, &rtp.Packet{Header: rtp.Header{Version: 2}})
ss.s.udpRTPListener.write(byts, ss.setuppedTracks[trackID].udpRTPAddr) ss.WritePacketRTCP(trackID, &rtcp.ReceiverReport{})
byts, _ = (&rtcp.ReceiverReport{}).Marshal()
ss.s.udpRTCPListener.write(byts, ss.setuppedTracks[trackID].udpRTCPAddr)
} }
default: // TCP default: // TCP