mirror of
https://github.com/bluenviron/mediamtx
synced 2025-02-09 16:07:36 +00:00
rtmp server: fix responses to ping requests (#1245)
This commit is contained in:
parent
8bee4af86a
commit
6471800b52
@ -38,7 +38,7 @@ func (rw *ReadWriter) Read() (Message, error) {
|
|||||||
rw.w.SetAcknowledgeValue(tmsg.Value)
|
rw.w.SetAcknowledgeValue(tmsg.Value)
|
||||||
|
|
||||||
case *MsgUserControlPingRequest:
|
case *MsgUserControlPingRequest:
|
||||||
rw.w.Write(&MsgUserControlPingRequest{
|
rw.w.Write(&MsgUserControlPingResponse{
|
||||||
ServerTime: tmsg.ServerTime,
|
ServerTime: tmsg.ServerTime,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
72
internal/rtmp/message/readwriter_test.go
Normal file
72
internal/rtmp/message/readwriter_test.go
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
package message
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"io"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
|
"github.com/aler9/rtsp-simple-server/internal/rtmp/bytecounter"
|
||||||
|
)
|
||||||
|
|
||||||
|
type duplexRW struct {
|
||||||
|
io.Reader
|
||||||
|
io.Writer
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *duplexRW) Read(p []byte) (int, error) {
|
||||||
|
return d.Reader.Read(p)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *duplexRW) Write(p []byte) (int, error) {
|
||||||
|
return d.Writer.Write(p)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestReadWriterAcknowledge(t *testing.T) {
|
||||||
|
var buf1 bytes.Buffer
|
||||||
|
var buf2 bytes.Buffer
|
||||||
|
|
||||||
|
rw1 := NewReadWriter(bytecounter.NewReadWriter(&duplexRW{
|
||||||
|
Reader: &buf2,
|
||||||
|
Writer: &buf1,
|
||||||
|
}), true)
|
||||||
|
err := rw1.Write(&MsgAcknowledge{
|
||||||
|
Value: 7863534,
|
||||||
|
})
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
rw2 := NewReadWriter(bytecounter.NewReadWriter(&duplexRW{
|
||||||
|
Reader: &buf1,
|
||||||
|
Writer: &buf2,
|
||||||
|
}), true)
|
||||||
|
_, err = rw2.Read()
|
||||||
|
require.NoError(t, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestReadWriterPing(t *testing.T) {
|
||||||
|
var buf1 bytes.Buffer
|
||||||
|
var buf2 bytes.Buffer
|
||||||
|
|
||||||
|
rw1 := NewReadWriter(bytecounter.NewReadWriter(&duplexRW{
|
||||||
|
Reader: &buf2,
|
||||||
|
Writer: &buf1,
|
||||||
|
}), true)
|
||||||
|
err := rw1.Write(&MsgUserControlPingRequest{
|
||||||
|
ServerTime: 143424312,
|
||||||
|
})
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
rw2 := NewReadWriter(bytecounter.NewReadWriter(&duplexRW{
|
||||||
|
Reader: &buf1,
|
||||||
|
Writer: &buf2,
|
||||||
|
}), true)
|
||||||
|
_, err = rw2.Read()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
msg, err := rw1.Read()
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.Equal(t, &MsgUserControlPingResponse{
|
||||||
|
ServerTime: 143424312,
|
||||||
|
}, msg)
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user