diff --git a/pkg/base/request.go b/pkg/base/request.go index 7739b53e..769ed769 100644 --- a/pkg/base/request.go +++ b/pkg/base/request.go @@ -75,10 +75,10 @@ func (req *Request) Read(rb *bufio.Reader) error { if err != nil { return err } - proto := string(byts[:len(byts)-1]) + proto := byts[:len(byts)-1] - if proto != rtspProtocol10 { - return fmt.Errorf("expected '%s', got '%s'", rtspProtocol10, proto) + if string(proto) != rtspProtocol10 { + return fmt.Errorf("expected '%s', got %v", rtspProtocol10, proto) } err = readByteEqual(rb, '\n') diff --git a/pkg/base/request_test.go b/pkg/base/request_test.go index 32bd6d7b..137bb483 100644 --- a/pkg/base/request_test.go +++ b/pkg/base/request_test.go @@ -187,7 +187,7 @@ func TestRequestReadErrors(t *testing.T) { { "empty protocol", []byte("GET rtsp://testing123 \r\n"), - "expected 'RTSP/1.0', got ''", + "expected 'RTSP/1.0', got []", }, { "invalid URL", @@ -197,7 +197,7 @@ func TestRequestReadErrors(t *testing.T) { { "invalid protocol", []byte("GET rtsp://testing123 RTSP/2.0\r\n"), - "expected 'RTSP/1.0', got 'RTSP/2.0'", + "expected 'RTSP/1.0', got [82 84 83 80 47 50 46 48]", }, { "invalid header", diff --git a/pkg/base/response.go b/pkg/base/response.go index 8ab7c959..1bc19c1a 100644 --- a/pkg/base/response.go +++ b/pkg/base/response.go @@ -139,10 +139,10 @@ func (res *Response) Read(rb *bufio.Reader) error { if err != nil { return err } - proto := string(byts[:len(byts)-1]) + proto := byts[:len(byts)-1] - if proto != rtspProtocol10 { - return fmt.Errorf("expected '%s', got '%s'", rtspProtocol10, proto) + if string(proto) != rtspProtocol10 { + return fmt.Errorf("expected '%s', got %v", rtspProtocol10, proto) } byts, err = readBytesLimited(rb, ' ', 4) diff --git a/pkg/base/response_test.go b/pkg/base/response_test.go index f868299c..0aeb69f4 100644 --- a/pkg/base/response_test.go +++ b/pkg/base/response_test.go @@ -139,7 +139,7 @@ func TestResponseReadErrors(t *testing.T) { { "invalid protocol", []byte("RTSP/2.0 200 OK\r\n"), - "expected 'RTSP/1.0', got 'RTSP/2.0'", + "expected 'RTSP/1.0', got [82 84 83 80 47 50 46 48]", }, { "code too long",