From 6471800b5268893b7cd6943b683859ffbedfe8da Mon Sep 17 00:00:00 2001
From: Alessandro Ros <aler9.dev@gmail.com>
Date: Mon, 14 Nov 2022 11:39:33 +0100
Subject: [PATCH] rtmp server: fix responses to ping requests (#1245)

---
 internal/rtmp/message/readwriter.go      |  2 +-
 internal/rtmp/message/readwriter_test.go | 72 ++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 internal/rtmp/message/readwriter_test.go

diff --git a/internal/rtmp/message/readwriter.go b/internal/rtmp/message/readwriter.go
index b4e50584..5c015dfa 100644
--- a/internal/rtmp/message/readwriter.go
+++ b/internal/rtmp/message/readwriter.go
@@ -38,7 +38,7 @@ func (rw *ReadWriter) Read() (Message, error) {
 		rw.w.SetAcknowledgeValue(tmsg.Value)
 
 	case *MsgUserControlPingRequest:
-		rw.w.Write(&MsgUserControlPingRequest{
+		rw.w.Write(&MsgUserControlPingResponse{
 			ServerTime: tmsg.ServerTime,
 		})
 	}
diff --git a/internal/rtmp/message/readwriter_test.go b/internal/rtmp/message/readwriter_test.go
new file mode 100644
index 00000000..7ba1635b
--- /dev/null
+++ b/internal/rtmp/message/readwriter_test.go
@@ -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)
+}