diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 00fb0b17..7b1a66e1 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,7 @@ jobs: - uses: golangci/golangci-lint-action@v3 with: - version: v1.55.2 + version: v1.56.2 go-mod-tidy: runs-on: ubuntu-20.04 diff --git a/.golangci.yml b/.golangci.yml index d2c93841..33a993a4 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -15,6 +15,7 @@ linters: - nilerr - prealloc - revive + - usestdlibvars - unconvert - tparallel - wastedassign diff --git a/Makefile b/Makefile index 3459af40..7c52b4a9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ BASE_IMAGE = golang:1.21-alpine3.18 -LINT_IMAGE = golangci/golangci-lint:v1.55.2 +LINT_IMAGE = golangci/golangci-lint:v1.56.2 .PHONY: $(shell ls) diff --git a/client_play_test.go b/client_play_test.go index ca740b79..8b49797b 100644 --- a/client_play_test.go +++ b/client_play_test.go @@ -524,7 +524,7 @@ func TestClientPlay(t *testing.T) { err = c.SetupAll(sd.BaseURL, sd.Medias) require.NoError(t, err) - c.OnPacketRTPAny(func(medi *description.Media, forma format.Format, pkt *rtp.Packet) { + c.OnPacketRTPAny(func(medi *description.Media, _ format.Format, pkt *rtp.Packet) { require.Equal(t, &testRTPPacket, pkt) err := c.WritePacketRTCP(medi, &testRTCPPacket) require.NoError(t, err) @@ -950,7 +950,7 @@ func TestClientPlayAnyPort(t *testing.T) { var med *description.Media err = readAll(&c, "rtsp://localhost:8554/teststream", - func(medi *description.Media, forma format.Format, pkt *rtp.Packet) { + func(medi *description.Media, _ format.Format, pkt *rtp.Packet) { require.Equal(t, &testRTPPacket, pkt) med = medi close(packetRecv) @@ -1074,7 +1074,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) { } err = readAll(&c, "rtsp://localhost:8554/teststream", - func(medi *description.Media, forma format.Format, pkt *rtp.Packet) { + func(_ *description.Media, _ format.Format, _ *rtp.Packet) { close(packetRecv) }) require.NoError(t, err) @@ -1247,7 +1247,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) { } err = readAll(&c, "rtsp://localhost:8554/teststream", - func(medi *description.Media, forma format.Format, pkt *rtp.Packet) { + func(_ *description.Media, _ format.Format, _ *rtp.Packet) { close(packetRecv) }) require.NoError(t, err) @@ -1481,7 +1481,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) { } err = readAll(&c, "rtsp://myuser:mypass@localhost:8554/teststream", - func(medi *description.Media, forma format.Format, pkt *rtp.Packet) { + func(_ *description.Media, _ format.Format, _ *rtp.Packet) { close(packetRecv) }) require.NoError(t, err) @@ -1597,7 +1597,7 @@ func TestClientPlayDifferentInterleavedIDs(t *testing.T) { } err = readAll(&c, "rtsp://localhost:8554/teststream", - func(medi *description.Media, forma format.Format, pkt *rtp.Packet) { + func(_ *description.Media, _ format.Format, _ *rtp.Packet) { close(packetRecv) }) require.NoError(t, err) @@ -1783,7 +1783,7 @@ func TestClientPlayRedirect(t *testing.T) { ru = "rtsp://testusr:testpwd@localhost:8554/path1" } err = readAll(&c, ru, - func(medi *description.Media, forma format.Format, pkt *rtp.Packet) { + func(_ *description.Media, _ format.Format, _ *rtp.Packet) { close(packetRecv) }) require.NoError(t, err) @@ -1981,7 +1981,7 @@ func TestClientPlayPause(t *testing.T) { } err = readAll(&c, "rtsp://localhost:8554/teststream", - func(medi *description.Media, forma format.Format, pkt *rtp.Packet) { + func(_ *description.Media, _ format.Format, _ *rtp.Packet) { if atomic.SwapInt32(&firstFrame, 1) == 0 { close(packetRecv) } @@ -2427,7 +2427,7 @@ func TestClientPlayIgnoreTCPInvalidMedia(t *testing.T) { } err = readAll(&c, "rtsp://localhost:8554/teststream", - func(medi *description.Media, forma format.Format, pkt *rtp.Packet) { + func(_ *description.Media, _ format.Format, _ *rtp.Packet) { close(recv) }) require.NoError(t, err) @@ -2731,7 +2731,7 @@ func TestClientPlayKeepalive(t *testing.T) { v := TransportTCP c := Client{ Transport: &v, - OnResponse: func(res *base.Response) { + OnResponse: func(_ *base.Response) { m++ if ca != "no response" { if m >= 5 { @@ -2746,7 +2746,7 @@ func TestClientPlayKeepalive(t *testing.T) { } err = readAll(&c, "rtsp://localhost:8554/teststream", - func(medi *description.Media, forma format.Format, pkt *rtp.Packet) { + func(_ *description.Media, _ format.Format, pkt *rtp.Packet) { require.Equal(t, &testRTPPacket, pkt) n++ if n == 2 { @@ -2879,7 +2879,7 @@ func TestClientPlayDifferentSource(t *testing.T) { } err = readAll(&c, "rtsp://localhost:8554/test/stream?param=value", - func(medi *description.Media, forma format.Format, pkt *rtp.Packet) { + func(_ *description.Media, _ format.Format, pkt *rtp.Packet) { require.Equal(t, &testRTPPacket, pkt) close(packetRecv) }) @@ -3324,7 +3324,7 @@ func TestClientPlayPacketNTP(t *testing.T) { first := false err = readAll(&c, "rtsp://localhost:8554/teststream", - func(medi *description.Media, forma format.Format, pkt *rtp.Packet) { + func(medi *description.Media, _ format.Format, pkt *rtp.Packet) { if !first { first = true } else { @@ -3510,7 +3510,7 @@ func TestClientPlayBackChannel(t *testing.T) { recv := make(chan struct{}) - c.OnPacketRTP(sd.Medias[0], sd.Medias[0].Formats[0], func(pkt *rtp.Packet) { + c.OnPacketRTP(sd.Medias[0], sd.Medias[0].Formats[0], func(_ *rtp.Packet) { close(recv) }) diff --git a/client_record_test.go b/client_record_test.go index ef44841f..68a87abc 100644 --- a/client_record_test.go +++ b/client_record_test.go @@ -309,7 +309,7 @@ func TestClientRecordSerial(t *testing.T) { medias := []*description.Media{medi} err = record(&c, scheme+"://localhost:8554/teststream", medias, - func(medi *description.Media, pkt rtcp.Packet) { + func(_ *description.Media, pkt rtcp.Packet) { require.Equal(t, &testRTCPPacket, pkt) close(recvDone) }) @@ -1351,7 +1351,7 @@ func TestClientRecordIgnoreTCPRTPPackets(t *testing.T) { medias := []*description.Media{testH264Media} err = record(&c, "rtsp://localhost:8554/teststream", medias, - func(medi *description.Media, pkt rtcp.Packet) { + func(_ *description.Media, _ rtcp.Packet) { close(rtcpReceived) }) require.NoError(t, err) diff --git a/pkg/auth/sender_test.go b/pkg/auth/sender_test.go index c4eca4fb..83defa6c 100644 --- a/pkg/auth/sender_test.go +++ b/pkg/auth/sender_test.go @@ -14,7 +14,7 @@ func FuzzSender(f *testing.F) { f.Add(`Basic`) f.Add(`Basic nonce=123`) - f.Fuzz(func(t *testing.T, a string) { + f.Fuzz(func(_ *testing.T, a string) { NewSender(base.HeaderValue{a}, "myuser", "mypass") //nolint:errcheck }) } diff --git a/pkg/auth/validate_test.go b/pkg/auth/validate_test.go index f062e62b..d85d507c 100644 --- a/pkg/auth/validate_test.go +++ b/pkg/auth/validate_test.go @@ -18,7 +18,7 @@ func FuzzValidate(f *testing.F) { f.Add(`Digest realm=123,nonce=123,username=123,uri=123,response=123`) f.Add(`Digest realm=123,nonce=abcde,username=123,uri=123,response=123`) - f.Fuzz(func(t *testing.T, a string) { + f.Fuzz(func(_ *testing.T, a string) { Validate( //nolint:errcheck &base.Request{ Method: base.Describe, diff --git a/pkg/base/body_test.go b/pkg/base/body_test.go index 0e55a25d..95020fe6 100644 --- a/pkg/base/body_test.go +++ b/pkg/base/body_test.go @@ -43,7 +43,7 @@ func TestBodyMarshal(t *testing.T) { } func FuzzBodyUnmarshal(f *testing.F) { - f.Fuzz(func(t *testing.T, a string, b []byte) { + f.Fuzz(func(_ *testing.T, a string, b []byte) { var p body p.unmarshal( //nolint:errcheck Header{ diff --git a/pkg/base/header_test.go b/pkg/base/header_test.go index f4322e95..2fe566f7 100644 --- a/pkg/base/header_test.go +++ b/pkg/base/header_test.go @@ -132,7 +132,7 @@ func FuzzHeaderUnmarshal(f *testing.F) { } f.Add([]byte(str)) - f.Fuzz(func(t *testing.T, b []byte) { + f.Fuzz(func(_ *testing.T, b []byte) { var h Header h.unmarshal(bufio.NewReader(bytes.NewBuffer(b))) //nolint:errcheck }) diff --git a/pkg/base/interleaved_frame_test.go b/pkg/base/interleaved_frame_test.go index aac069eb..6a323cc2 100644 --- a/pkg/base/interleaved_frame_test.go +++ b/pkg/base/interleaved_frame_test.go @@ -55,7 +55,7 @@ func TestInterleavedFrameMarshal(t *testing.T) { } func FuzzInterleavedFrameUnmarshal(f *testing.F) { - f.Fuzz(func(t *testing.T, b []byte) { + f.Fuzz(func(_ *testing.T, b []byte) { var f InterleavedFrame f.Unmarshal(bufio.NewReader(bytes.NewBuffer(b))) //nolint:errcheck }) diff --git a/pkg/base/request_test.go b/pkg/base/request_test.go index 88ad6c80..88c46047 100644 --- a/pkg/base/request_test.go +++ b/pkg/base/request_test.go @@ -189,7 +189,7 @@ func FuzzRequestUnmarshal(f *testing.F) { "\r\n" + "testing")) - f.Fuzz(func(t *testing.T, b []byte) { + f.Fuzz(func(_ *testing.T, b []byte) { var req Request req.Unmarshal(bufio.NewReader(bytes.NewBuffer(b))) //nolint:errcheck }) diff --git a/pkg/base/response_test.go b/pkg/base/response_test.go index f8709961..33982f0e 100644 --- a/pkg/base/response_test.go +++ b/pkg/base/response_test.go @@ -163,7 +163,7 @@ func FuzzResponseUnmarshal(f *testing.F) { "\r\n" + "testing")) - f.Fuzz(func(t *testing.T, b []byte) { + f.Fuzz(func(_ *testing.T, b []byte) { var res Response res.Unmarshal(bufio.NewReader(bytes.NewBuffer(b))) //nolint:errcheck }) diff --git a/pkg/description/session_test.go b/pkg/description/session_test.go index 864bffb8..489775ad 100644 --- a/pkg/description/session_test.go +++ b/pkg/description/session_test.go @@ -889,7 +889,7 @@ func FuzzSessionUnmarshalErrors(f *testing.F) { "a=rtpmap:101 ulpfec/8000\r\n" + "a=mid:4\r\n") - f.Fuzz(func(t *testing.T, enc string) { + f.Fuzz(func(_ *testing.T, enc string) { var sd sdp.SessionDescription err := sd.Unmarshal([]byte(enc)) if err != nil { diff --git a/pkg/format/format_test.go b/pkg/format/format_test.go index 4d3ba36d..3504f8fd 100644 --- a/pkg/format/format_test.go +++ b/pkg/format/format_test.go @@ -1208,7 +1208,7 @@ func TestUnmarshalErrors(t *testing.T) { } func FuzzUnmarshalH264(f *testing.F) { - f.Fuzz(func(t *testing.T, sps string, pktMode string) { + f.Fuzz(func(_ *testing.T, sps string, pktMode string) { Unmarshal("video", 96, "H264/90000", map[string]string{ //nolint:errcheck "sprop-parameter-sets": sps, "packetization-mode": pktMode, @@ -1217,7 +1217,7 @@ func FuzzUnmarshalH264(f *testing.F) { } func FuzzUnmarshalH265(f *testing.F) { - f.Fuzz(func(t *testing.T, a, b, c, d string) { + f.Fuzz(func(_ *testing.T, a, b, c, d string) { Unmarshal("video", 96, "H265/90000", map[string]string{ //nolint:errcheck "sprop-vps": a, "sprop-sps": b, @@ -1228,13 +1228,13 @@ func FuzzUnmarshalH265(f *testing.F) { } func FuzzUnmarshalLPCM(f *testing.F) { - f.Fuzz(func(t *testing.T, a string) { + f.Fuzz(func(_ *testing.T, a string) { Unmarshal("audio", 96, "L16/"+a, nil) //nolint:errcheck }) } func FuzzUnmarshalMPEG4Video(f *testing.F) { - f.Fuzz(func(t *testing.T, a, b string) { + f.Fuzz(func(_ *testing.T, a, b string) { Unmarshal("video", 96, "MP4V-ES/90000", map[string]string{ //nolint:errcheck "profile-level-id": a, "config": b, @@ -1245,13 +1245,13 @@ func FuzzUnmarshalMPEG4Video(f *testing.F) { func FuzzUnmarshalOpus(f *testing.F) { f.Add("48000/a") - f.Fuzz(func(t *testing.T, a string) { + f.Fuzz(func(_ *testing.T, a string) { Unmarshal("audio", 96, "Opus/"+a, nil) //nolint:errcheck }) } func FuzzUnmarshalVorbis(f *testing.F) { - f.Fuzz(func(t *testing.T, a, b string) { + f.Fuzz(func(_ *testing.T, a, b string) { Unmarshal("audio", 96, "Vorbis/"+a, map[string]string{ //nolint:errcheck "configuration": b, }) @@ -1259,7 +1259,7 @@ func FuzzUnmarshalVorbis(f *testing.F) { } func FuzzUnmarshalVP8(f *testing.F) { - f.Fuzz(func(t *testing.T, a, b string) { + f.Fuzz(func(_ *testing.T, a, b string) { Unmarshal("video", 96, "VP8/90000", map[string]string{ //nolint:errcheck "max-fr": a, "max-fs": b, @@ -1268,7 +1268,7 @@ func FuzzUnmarshalVP8(f *testing.F) { } func FuzzUnmarshalVP9(f *testing.F) { - f.Fuzz(func(t *testing.T, a, b, c string) { + f.Fuzz(func(_ *testing.T, a, b, c string) { Unmarshal("video", 96, "VP9/90000", map[string]string{ //nolint:errcheck "max-fr": a, "max-fs": b, diff --git a/pkg/format/rtpav1/decoder_test.go b/pkg/format/rtpav1/decoder_test.go index dbe1c3ff..7c2a2343 100644 --- a/pkg/format/rtpav1/decoder_test.go +++ b/pkg/format/rtpav1/decoder_test.go @@ -56,7 +56,7 @@ func TestDecoderErrorLimit(t *testing.T) { } func FuzzDecoder(f *testing.F) { - f.Fuzz(func(t *testing.T, a []byte, am bool, b []byte, bm bool) { + f.Fuzz(func(_ *testing.T, a []byte, am bool, b []byte, bm bool) { d := &Decoder{} d.Init() //nolint:errcheck diff --git a/pkg/format/rtph264/decoder_test.go b/pkg/format/rtph264/decoder_test.go index 8293a46d..4e1955b4 100644 --- a/pkg/format/rtph264/decoder_test.go +++ b/pkg/format/rtph264/decoder_test.go @@ -213,7 +213,7 @@ func TestDecoderErrorLimit(t *testing.T) { } func FuzzDecoder(f *testing.F) { - f.Fuzz(func(t *testing.T, a []byte, b []byte) { + f.Fuzz(func(_ *testing.T, a []byte, b []byte) { d := &Decoder{} d.Init() //nolint:errcheck diff --git a/pkg/format/rtph265/decoder_test.go b/pkg/format/rtph265/decoder_test.go index 82baaaba..0a5cbd8e 100644 --- a/pkg/format/rtph265/decoder_test.go +++ b/pkg/format/rtph265/decoder_test.go @@ -62,7 +62,7 @@ func TestDecoderErrorLimit(t *testing.T) { } func FuzzDecoder(f *testing.F) { - f.Fuzz(func(t *testing.T, a []byte, b []byte) { + f.Fuzz(func(_ *testing.T, a []byte, b []byte) { d := &Decoder{} d.Init() //nolint:errcheck diff --git a/pkg/format/rtplpcm/decoder_test.go b/pkg/format/rtplpcm/decoder_test.go index f8a7e136..32aed108 100644 --- a/pkg/format/rtplpcm/decoder_test.go +++ b/pkg/format/rtplpcm/decoder_test.go @@ -31,7 +31,7 @@ func TestDecode(t *testing.T) { } func FuzzDecoder(f *testing.F) { - f.Fuzz(func(t *testing.T, b []byte) { + f.Fuzz(func(_ *testing.T, b []byte) { d := &Decoder{ BitDepth: 24, ChannelCount: 2, diff --git a/pkg/format/rtpmjpeg/decoder_test.go b/pkg/format/rtpmjpeg/decoder_test.go index 87e9074e..7ca88fe5 100644 --- a/pkg/format/rtpmjpeg/decoder_test.go +++ b/pkg/format/rtpmjpeg/decoder_test.go @@ -29,7 +29,7 @@ func TestDecode(t *testing.T) { } func FuzzDecoder(f *testing.F) { - f.Fuzz(func(t *testing.T, a []byte, am bool, b []byte, bm bool) { + f.Fuzz(func(_ *testing.T, a []byte, am bool, b []byte, bm bool) { d := &Decoder{} d.Init() //nolint:errcheck diff --git a/pkg/format/rtpmpeg1audio/decoder_test.go b/pkg/format/rtpmpeg1audio/decoder_test.go index da87e39b..312eec7e 100644 --- a/pkg/format/rtpmpeg1audio/decoder_test.go +++ b/pkg/format/rtpmpeg1audio/decoder_test.go @@ -27,7 +27,7 @@ func TestDecode(t *testing.T) { } func FuzzDecoder(f *testing.F) { - f.Fuzz(func(t *testing.T, a []byte, b []byte) { + f.Fuzz(func(_ *testing.T, a []byte, b []byte) { d := &Decoder{} d.Init() //nolint:errcheck diff --git a/pkg/format/rtpmpeg1video/decoder_test.go b/pkg/format/rtpmpeg1video/decoder_test.go index 9cc59ab3..7c2b3574 100644 --- a/pkg/format/rtpmpeg1video/decoder_test.go +++ b/pkg/format/rtpmpeg1video/decoder_test.go @@ -27,7 +27,7 @@ func TestDecode(t *testing.T) { } func FuzzDecoder(f *testing.F) { - f.Fuzz(func(t *testing.T, a []byte, b []byte) { + f.Fuzz(func(_ *testing.T, a []byte, b []byte) { d := &Decoder{} d.Init() //nolint:errcheck diff --git a/pkg/format/rtpmpeg4audio/decoder_latm_test.go b/pkg/format/rtpmpeg4audio/decoder_latm_test.go index 4cb0e3fd..d4418d7e 100644 --- a/pkg/format/rtpmpeg4audio/decoder_latm_test.go +++ b/pkg/format/rtpmpeg4audio/decoder_latm_test.go @@ -64,7 +64,7 @@ func TestDecodeLATMOtherData(t *testing.T) { } func FuzzDecoderLATM(f *testing.F) { - f.Fuzz(func(t *testing.T, a []byte, am bool, b []byte, bm bool) { + f.Fuzz(func(_ *testing.T, a []byte, am bool, b []byte, bm bool) { d := &Decoder{ LATM: true, } diff --git a/pkg/format/rtpmpeg4video/decoder_test.go b/pkg/format/rtpmpeg4video/decoder_test.go index abaa7b98..f44401df 100644 --- a/pkg/format/rtpmpeg4video/decoder_test.go +++ b/pkg/format/rtpmpeg4video/decoder_test.go @@ -32,7 +32,7 @@ func TestDecode(t *testing.T) { } func FuzzDecoder(f *testing.F) { - f.Fuzz(func(t *testing.T, a []byte, am bool, b []byte, bm bool) { + f.Fuzz(func(_ *testing.T, a []byte, am bool, b []byte, bm bool) { d := &Decoder{} d.Init() //nolint:errcheck diff --git a/pkg/format/rtpvp8/decoder_test.go b/pkg/format/rtpvp8/decoder_test.go index 991d1b7b..b42a3faa 100644 --- a/pkg/format/rtpvp8/decoder_test.go +++ b/pkg/format/rtpvp8/decoder_test.go @@ -27,7 +27,7 @@ func TestDecode(t *testing.T) { } func FuzzDecoder(f *testing.F) { - f.Fuzz(func(t *testing.T, a []byte, am bool, b []byte, bm bool) { + f.Fuzz(func(_ *testing.T, a []byte, am bool, b []byte, bm bool) { d := &Decoder{} d.Init() //nolint:errcheck diff --git a/pkg/format/rtpvp9/decoder_test.go b/pkg/format/rtpvp9/decoder_test.go index d6195f29..2e437436 100644 --- a/pkg/format/rtpvp9/decoder_test.go +++ b/pkg/format/rtpvp9/decoder_test.go @@ -27,7 +27,7 @@ func TestDecode(t *testing.T) { } func FuzzDecoder(f *testing.F) { - f.Fuzz(func(t *testing.T, a []byte, am bool, b []byte, bm bool) { + f.Fuzz(func(_ *testing.T, a []byte, am bool, b []byte, bm bool) { d := &Decoder{} d.Init() //nolint:errcheck diff --git a/pkg/headers/authenticate_test.go b/pkg/headers/authenticate_test.go index 6aa1c15b..e9932156 100644 --- a/pkg/headers/authenticate_test.go +++ b/pkg/headers/authenticate_test.go @@ -117,7 +117,7 @@ func FuzzAuthenticateUnmarshal(f *testing.F) { f.Add(ca.vin[0]) } - f.Fuzz(func(t *testing.T, b string) { + f.Fuzz(func(_ *testing.T, b string) { var h Authenticate h.Unmarshal(base.HeaderValue{b}) //nolint:errcheck }) diff --git a/pkg/headers/authorization_test.go b/pkg/headers/authorization_test.go index f9a1a624..a7556224 100644 --- a/pkg/headers/authorization_test.go +++ b/pkg/headers/authorization_test.go @@ -103,7 +103,7 @@ func FuzzAuthorizationUnmarshal(f *testing.F) { f.Add(ca.vin[0]) } - f.Fuzz(func(t *testing.T, b string) { + f.Fuzz(func(_ *testing.T, b string) { var h Authorization h.Unmarshal(base.HeaderValue{b}) //nolint:errcheck }) diff --git a/pkg/headers/keyval_test.go b/pkg/headers/keyval_test.go index 75283d71..1d3da93f 100644 --- a/pkg/headers/keyval_test.go +++ b/pkg/headers/keyval_test.go @@ -86,7 +86,7 @@ func TestKeyValParse(t *testing.T) { } func FuzzKeyValParse(f *testing.F) { - f.Fuzz(func(t *testing.T, b string) { + f.Fuzz(func(_ *testing.T, b string) { keyValParse(b, ',') //nolint:errcheck }) } diff --git a/pkg/headers/range_test.go b/pkg/headers/range_test.go index 8410e6c7..96f08374 100644 --- a/pkg/headers/range_test.go +++ b/pkg/headers/range_test.go @@ -149,7 +149,7 @@ func FuzzRangeUnmarshal(f *testing.F) { f.Add("npt=") f.Add("clock=") - f.Fuzz(func(t *testing.T, b string) { + f.Fuzz(func(_ *testing.T, b string) { var h Range h.Unmarshal(base.HeaderValue{b}) //nolint:errcheck }) diff --git a/pkg/headers/rtpinfo_test.go b/pkg/headers/rtpinfo_test.go index b116d0e1..d7de73d1 100644 --- a/pkg/headers/rtpinfo_test.go +++ b/pkg/headers/rtpinfo_test.go @@ -156,7 +156,7 @@ func FuzzRTPInfoUnmarshal(f *testing.F) { f.Add(ca.vin[0]) } - f.Fuzz(func(t *testing.T, b string) { + f.Fuzz(func(_ *testing.T, b string) { var h RTPInfo h.Unmarshal(base.HeaderValue{b}) //nolint:errcheck }) diff --git a/pkg/headers/session_test.go b/pkg/headers/session_test.go index 15448fe1..3bc0e46d 100644 --- a/pkg/headers/session_test.go +++ b/pkg/headers/session_test.go @@ -69,7 +69,7 @@ func FuzzSessionUnmarshal(f *testing.F) { f.Add("timeout=") - f.Fuzz(func(t *testing.T, b string) { + f.Fuzz(func(_ *testing.T, b string) { var h Session h.Unmarshal(base.HeaderValue{b}) //nolint:errcheck }) diff --git a/pkg/headers/transport_test.go b/pkg/headers/transport_test.go index a462dbc7..a0cc3705 100644 --- a/pkg/headers/transport_test.go +++ b/pkg/headers/transport_test.go @@ -254,7 +254,7 @@ func FuzzTransportsUnmarshal(f *testing.F) { f.Add("server_port=") f.Add("mode=") - f.Fuzz(func(t *testing.T, b string) { + f.Fuzz(func(_ *testing.T, b string) { var h Transports h.Unmarshal(base.HeaderValue{b}) //nolint:errcheck }) diff --git a/pkg/sdp/sdp_test.go b/pkg/sdp/sdp_test.go index 6d48df32..c2a524c2 100644 --- a/pkg/sdp/sdp_test.go +++ b/pkg/sdp/sdp_test.go @@ -2964,7 +2964,7 @@ func FuzzUnmarshal(f *testing.F) { f.Add("v=0\r\n" + "o = IN \r\n") - f.Fuzz(func(t *testing.T, b string) { + f.Fuzz(func(_ *testing.T, b string) { desc := SessionDescription{} desc.Unmarshal([]byte(b)) //nolint:errcheck }) diff --git a/server_play_test.go b/server_play_test.go index bc47c56f..897a2ebb 100644 --- a/server_play_test.go +++ b/server_play_test.go @@ -227,7 +227,7 @@ func TestServerPlayPath(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil @@ -315,12 +315,12 @@ func TestServerPlaySetupErrors(t *testing.T) { } close(nconnClosed) }, - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil @@ -428,17 +428,17 @@ func TestServerPlaySetupErrorSameUDPPortsAndIP(t *testing.T) { close(errorRecv) } }, - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -511,24 +511,24 @@ func TestServerPlay(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onConnOpen: func(ctx *ServerHandlerOnConnOpenCtx) { + onConnOpen: func(_ *ServerHandlerOnConnOpenCtx) { close(nconnOpened) }, - onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { + onConnClose: func(_ *ServerHandlerOnConnCloseCtx) { close(nconnClosed) }, - onSessionOpen: func(ctx *ServerHandlerOnSessionOpenCtx) { + onSessionOpen: func(_ *ServerHandlerOnSessionOpenCtx) { close(sessionOpened) }, - onSessionClose: func(ctx *ServerHandlerOnSessionCloseCtx) { + onSessionClose: func(_ *ServerHandlerOnSessionCloseCtx) { close(sessionClosed) }, - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil @@ -584,7 +584,7 @@ func TestServerPlay(t *testing.T) { StatusCode: base.StatusOK, }, nil }, - onGetParameter: func(ctx *ServerHandlerOnGetParameterCtx) (*base.Response, error) { + onGetParameter: func(_ *ServerHandlerOnGetParameterCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -847,17 +847,17 @@ func TestServerPlayDecodeErrors(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -975,17 +975,17 @@ func TestServerPlayRTCPReport(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -1108,7 +1108,7 @@ func TestServerPlayVLCMulticast(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil @@ -1157,21 +1157,21 @@ func TestServerPlayTCPResponseBeforeFrames(t *testing.T) { s := &Server{ RTSPAddress: "localhost:8554", Handler: &testServerHandler{ - onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { + onConnClose: func(_ *ServerHandlerOnConnCloseCtx) { close(writerTerminate) <-writerDone }, - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { go func() { defer close(writerDone) @@ -1237,17 +1237,17 @@ func TestServerPlayPlayPlay(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -1295,21 +1295,21 @@ func TestServerPlayPlayPausePlay(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { + onConnClose: func(_ *ServerHandlerOnConnCloseCtx) { close(writerTerminate) <-writerDone }, - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { if !writerStarted { writerStarted = true go func() { @@ -1334,7 +1334,7 @@ func TestServerPlayPlayPausePlay(t *testing.T) { StatusCode: base.StatusOK, }, nil }, - onPause: func(ctx *ServerHandlerOnPauseCtx) (*base.Response, error) { + onPause: func(_ *ServerHandlerOnPauseCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -1380,21 +1380,21 @@ func TestServerPlayPlayPausePause(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { + onConnClose: func(_ *ServerHandlerOnConnCloseCtx) { close(writerTerminate) <-writerDone }, - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { go func() { defer close(writerDone) @@ -1416,7 +1416,7 @@ func TestServerPlayPlayPausePause(t *testing.T) { StatusCode: base.StatusOK, }, nil }, - onPause: func(ctx *ServerHandlerOnPauseCtx) (*base.Response, error) { + onPause: func(_ *ServerHandlerOnPauseCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -1469,20 +1469,20 @@ func TestServerPlayTimeout(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onSessionClose: func(ctx *ServerHandlerOnSessionCloseCtx) { + onSessionClose: func(_ *ServerHandlerOnSessionCloseCtx) { close(sessionClosed) }, - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -1559,23 +1559,23 @@ func TestServerPlayWithoutTeardown(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { + onConnClose: func(_ *ServerHandlerOnConnCloseCtx) { close(nconnClosed) }, - onSessionClose: func(ctx *ServerHandlerOnSessionCloseCtx) { + onSessionClose: func(_ *ServerHandlerOnSessionCloseCtx) { close(sessionClosed) }, - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -1637,22 +1637,22 @@ func TestServerPlayUDPChangeConn(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onGetParameter: func(ctx *ServerHandlerOnGetParameterCtx) (*base.Response, error) { + onGetParameter: func(_ *ServerHandlerOnGetParameterCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -1720,17 +1720,17 @@ func TestServerPlayPartialMedias(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { go func() { time.Sleep(500 * time.Millisecond) err := stream.WritePacketRTP(stream.Description().Medias[0], &testRTPPacket) @@ -1834,17 +1834,17 @@ func TestServerPlayAdditionalInfos(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -1953,17 +1953,17 @@ func TestServerPlayNoInterleavedIDs(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -2035,17 +2035,17 @@ func TestServerPlayBytesSent(t *testing.T) { MulticastRTPPort: 8000, MulticastRTCPPort: 8001, Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil diff --git a/server_record_test.go b/server_record_test.go index e9f5c988..84a513fe 100644 --- a/server_record_test.go +++ b/server_record_test.go @@ -142,7 +142,7 @@ func TestServerRecordErrorAnnounce(t *testing.T) { require.EqualError(t, ctx.Error, ca.err) close(nconnClosed) }, - onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { + onAnnounce: func(_ *ServerHandlerOnAnnounceCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -315,12 +315,12 @@ func TestServerRecordErrorSetupMediaTwice(t *testing.T) { onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { serverErr <- ctx.Error }, - onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { + onAnnounce: func(_ *ServerHandlerOnAnnounceCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil, nil @@ -384,17 +384,17 @@ func TestServerRecordErrorRecordPartialMedias(t *testing.T) { onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { serverErr <- ctx.Error }, - onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { + onAnnounce: func(_ *ServerHandlerOnAnnounceCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil, nil }, - onRecord: func(ctx *ServerHandlerOnRecordCtx) (*base.Response, error) { + onRecord: func(_ *ServerHandlerOnRecordCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -472,24 +472,24 @@ func TestServerRecord(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onConnOpen: func(ctx *ServerHandlerOnConnOpenCtx) { + onConnOpen: func(_ *ServerHandlerOnConnOpenCtx) { close(nconnOpened) }, - onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { + onConnClose: func(_ *ServerHandlerOnConnCloseCtx) { close(nconnClosed) }, - onSessionOpen: func(ctx *ServerHandlerOnSessionOpenCtx) { + onSessionOpen: func(_ *ServerHandlerOnSessionOpenCtx) { close(sessionOpened) }, - onSessionClose: func(ctx *ServerHandlerOnSessionCloseCtx) { + onSessionClose: func(_ *ServerHandlerOnSessionCloseCtx) { close(sessionClosed) }, - onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { + onAnnounce: func(_ *ServerHandlerOnAnnounceCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil, nil @@ -716,17 +716,17 @@ func TestServerRecordErrorInvalidProtocol(t *testing.T) { require.EqualError(t, ctx.Error, "received unexpected interleaved frame") close(errorRecv) }, - onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { + onAnnounce: func(_ *ServerHandlerOnAnnounceCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil, nil }, - onRecord: func(ctx *ServerHandlerOnRecordCtx) (*base.Response, error) { + onRecord: func(_ *ServerHandlerOnRecordCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -775,17 +775,17 @@ func TestServerRecordErrorInvalidProtocol(t *testing.T) { func TestServerRecordRTCPReport(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { + onAnnounce: func(_ *ServerHandlerOnAnnounceCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil, nil }, - onRecord: func(ctx *ServerHandlerOnRecordCtx) (*base.Response, error) { + onRecord: func(_ *ServerHandlerOnRecordCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -899,23 +899,23 @@ func TestServerRecordTimeout(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { + onConnClose: func(_ *ServerHandlerOnConnCloseCtx) { close(nconnClosed) }, - onSessionClose: func(ctx *ServerHandlerOnSessionCloseCtx) { + onSessionClose: func(_ *ServerHandlerOnSessionCloseCtx) { close(sessionClosed) }, - onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { + onAnnounce: func(_ *ServerHandlerOnAnnounceCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil, nil }, - onRecord: func(ctx *ServerHandlerOnRecordCtx) (*base.Response, error) { + onRecord: func(_ *ServerHandlerOnRecordCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -983,23 +983,23 @@ func TestServerRecordWithoutTeardown(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { + onConnClose: func(_ *ServerHandlerOnConnCloseCtx) { close(nconnClosed) }, - onSessionClose: func(ctx *ServerHandlerOnSessionCloseCtx) { + onSessionClose: func(_ *ServerHandlerOnSessionCloseCtx) { close(sessionClosed) }, - onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { + onAnnounce: func(_ *ServerHandlerOnAnnounceCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil, nil }, - onRecord: func(ctx *ServerHandlerOnRecordCtx) (*base.Response, error) { + onRecord: func(_ *ServerHandlerOnRecordCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -1056,22 +1056,22 @@ func TestServerRecordWithoutTeardown(t *testing.T) { func TestServerRecordUDPChangeConn(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { + onAnnounce: func(_ *ServerHandlerOnAnnounceCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil, nil }, - onRecord: func(ctx *ServerHandlerOnRecordCtx) (*base.Response, error) { + onRecord: func(_ *ServerHandlerOnRecordCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onGetParameter: func(ctx *ServerHandlerOnGetParameterCtx) (*base.Response, error) { + onGetParameter: func(_ *ServerHandlerOnGetParameterCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -1156,17 +1156,17 @@ func TestServerRecordDecodeErrors(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { + onAnnounce: func(_ *ServerHandlerOnAnnounceCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil, nil }, - onRecord: func(ctx *ServerHandlerOnRecordCtx) (*base.Response, error) { + onRecord: func(_ *ServerHandlerOnRecordCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -1365,18 +1365,18 @@ func TestServerRecordPacketNTP(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { + onAnnounce: func(_ *ServerHandlerOnAnnounceCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil, nil }, onRecord: func(ctx *ServerHandlerOnRecordCtx) (*base.Response, error) { - ctx.Session.OnPacketRTPAny(func(medi *description.Media, forma format.Format, pkt *rtp.Packet) { + ctx.Session.OnPacketRTPAny(func(medi *description.Media, _ format.Format, pkt *rtp.Packet) { if !first { first = true } else { @@ -1486,22 +1486,22 @@ func TestServerRecordPacketNTP(t *testing.T) { func TestServerRecordPausePause(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { + onAnnounce: func(_ *ServerHandlerOnAnnounceCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil, nil }, - onRecord: func(ctx *ServerHandlerOnRecordCtx) (*base.Response, error) { + onRecord: func(_ *ServerHandlerOnRecordCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onPause: func(ctx *ServerHandlerOnPauseCtx) (*base.Response, error) { + onPause: func(_ *ServerHandlerOnPauseCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil diff --git a/server_session.go b/server_session.go index cdc423fc..7cd82289 100644 --- a/server_session.go +++ b/server_session.go @@ -825,7 +825,7 @@ func (ss *ServerSession) handleRequestInner(sc *ServerConn, req *base.Request) ( sm := &serverSessionMedia{ ss: ss, media: medi, - onPacketRTCP: func(p rtcp.Packet) {}, + onPacketRTCP: func(_ rtcp.Packet) {}, } sm.initialize() diff --git a/server_test.go b/server_test.go index 54384581..62129416 100644 --- a/server_test.go +++ b/server_test.go @@ -233,7 +233,7 @@ func TestServerConnClose(t *testing.T) { ctx.Conn.Close() ctx.Conn.Close() }, - onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { + onConnClose: func(_ *ServerHandlerOnConnCloseCtx) { close(nconnClosed) }, }, @@ -451,22 +451,22 @@ func TestServerErrorTCPTwoConnOneSession(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onPause: func(ctx *ServerHandlerOnPauseCtx) (*base.Response, error) { + onPause: func(_ *ServerHandlerOnPauseCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -532,22 +532,22 @@ func TestServerErrorTCPOneConnTwoSessions(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onPause: func(ctx *ServerHandlerOnPauseCtx) (*base.Response, error) { + onPause: func(_ *ServerHandlerOnPauseCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -605,12 +605,12 @@ func TestServerSetupMultipleTransports(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil @@ -677,7 +677,7 @@ func TestServerGetSetParameter(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil @@ -790,17 +790,17 @@ func TestServerErrorInvalidSession(t *testing.T) { t.Run(string(method), func(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) { + onPlay: func(_ *ServerHandlerOnPlayCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onRecord: func(ctx *ServerHandlerOnRecordCtx) (*base.Response, error) { + onRecord: func(_ *ServerHandlerOnRecordCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil }, - onPause: func(ctx *ServerHandlerOnPauseCtx) (*base.Response, error) { + onPause: func(_ *ServerHandlerOnPauseCtx) (*base.Response, error) { return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -842,15 +842,15 @@ func TestServerSessionClose(t *testing.T) { onSessionOpen: func(ctx *ServerHandlerOnSessionOpenCtx) { session = ctx.Session }, - onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { + onConnClose: func(_ *ServerHandlerOnConnCloseCtx) { close(connClosed) }, - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil @@ -911,15 +911,15 @@ func TestServerSessionAutoClose(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onSessionClose: func(ctx *ServerHandlerOnSessionCloseCtx) { + onSessionClose: func(_ *ServerHandlerOnSessionCloseCtx) { close(sessionClosed) }, - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { if ca == "200" { return &base.Response{ StatusCode: base.StatusOK, @@ -982,12 +982,12 @@ func TestServerSessionTeardown(t *testing.T) { s := &Server{ Handler: &testServerHandler{ - onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { + onDescribe: func(_ *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil }, - onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { + onSetup: func(_ *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) { return &base.Response{ StatusCode: base.StatusOK, }, stream, nil