update golangci-lint

2025-10-04 23:02:45 +08:00 · 2021-05-23 18:43:40 +02:00
parent 70c0dc7800
commit 94e69f9c7f
18 changed files with 67 additions and 60 deletions
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -6,6 +6,7 @@ linters:
  - gochecknoinits
  - gocritic
  - gofmt
+  - gofumpt
  - golint
  - misspell
  - prealloc
--- a/16
+++ b/16
@@ -23,12 +23,20 @@ $(blank)
 endef

 mod-tidy:
-	docker run --rm -it -v $(PWD):/s $(BASE_IMAGE) \
-	sh -c "apk add git && cd /s && GOPROXY=direct go get && go mod tidy"
+	docker run --rm -it -v $(PWD):/s -w /s $(BASE_IMAGE) \
+	sh -c "apk add git && GOPROXY=direct go get && go mod tidy"
+
+define DOCKERFILE_FORMAT
+FROM $(BASE_IMAGE)
+RUN apk add --no-cache git
+RUN GO111MODULE=on go get mvdan.cc/gofumpt
+endef
+export DOCKERFILE_FORMAT

 format:
-	docker run --rm -it -v $(PWD):/s $(BASE_IMAGE) \
-	sh -c "cd /s && find . -type f -name '*.go' | xargs gofmt -l -w -s"
+	echo "$$DOCKERFILE_FORMAT" | docker build -q . -f - -t temp
+	docker run --rm -it -v $(PWD):/s -w /s temp \
+	sh -c "find . -type f -name '*.go' | xargs gofumpt -l -w"

 define DOCKERFILE_TEST
 FROM $(BASE_IMAGE)
--- a/client_publish_test.go
+++ b/client_publish_test.go
@@ -141,7 +141,6 @@ func TestClientPublishSerial(t *testing.T) {
 						IP:   net.ParseIP("127.0.0.1"),
 						Port: th.ClientPorts[1],
 					})
-
 				} else {
 					err = base.InterleavedFrame{
 						TrackID:    0,
--- a/clientconn.go
+++ b/clientconn.go
@@ -1112,7 +1112,8 @@ func (cc *ClientConn) doAnnounce(u *base.URL, tracks Tracks) (*base.Response, er

 	if res.StatusCode != base.StatusOK {
 		return nil, liberrors.ErrClientWrongStatusCode{
-			Code: res.StatusCode, Message: res.StatusMessage}
+			Code: res.StatusCode, Message: res.StatusMessage,
+		}
 	}

 	cc.streamBaseURL = baseURL
@@ -1139,7 +1140,6 @@ func (cc *ClientConn) doSetup(
 	track *Track,
 	rtpPort int,
 	rtcpPort int) (*base.Response, error) {
-
 	err := cc.checkState(map[clientConnState]struct{}{
 		clientConnStateInitial:   {},
 		clientConnStatePrePlay:   {},
@@ -1329,7 +1329,8 @@ func (cc *ClientConn) doSetup(
 		if thRes.InterleavedIDs[0] != th.InterleavedIDs[0] ||
 			thRes.InterleavedIDs[1] != th.InterleavedIDs[1] {
 			return nil, liberrors.ErrClientTransportHeaderWrongInterleavedIDs{
-				Expected: *th.InterleavedIDs, Value: *thRes.InterleavedIDs}
+				Expected: *th.InterleavedIDs, Value: *thRes.InterleavedIDs,
+			}
 		}
 	}

@@ -1391,7 +1392,6 @@ func (cc *ClientConn) Setup(
 	track *Track,
 	rtpPort int,
 	rtcpPort int) (*base.Response, error) {
-
 	cres := make(chan clientRes)
 	select {
 	case cc.setup <- setupReq{
@@ -1427,7 +1427,8 @@ func (cc *ClientConn) doPlay(isSwitchingProtocol bool) (*base.Response, error) {

 	if res.StatusCode != base.StatusOK {
 		return nil, liberrors.ErrClientWrongStatusCode{
-			Code: res.StatusCode, Message: res.StatusMessage}
+			Code: res.StatusCode, Message: res.StatusMessage,
+		}
 	}

 	cc.state = clientConnStatePlay
@@ -1484,7 +1485,8 @@ func (cc *ClientConn) doRecord() (*base.Response, error) {

 	if res.StatusCode != base.StatusOK {
 		return nil, liberrors.ErrClientWrongStatusCode{
-			Code: res.StatusCode, Message: res.StatusMessage}
+			Code: res.StatusCode, Message: res.StatusMessage,
+		}
 	}

 	cc.state = clientConnStateRecord
@@ -1534,7 +1536,8 @@ func (cc *ClientConn) doPause() (*base.Response, error) {

 	if res.StatusCode != base.StatusOK {
 		return res, liberrors.ErrClientWrongStatusCode{
-			Code: res.StatusCode, Message: res.StatusMessage}
+			Code: res.StatusCode, Message: res.StatusMessage,
+		}
 	}

 	switch cc.state {
--- a/pkg/auth/validator.go
+++ b/pkg/auth/validator.go
@@ -90,7 +90,6 @@ func (va *Validator) ValidateHeader(
 	method base.Method,
 	ur *base.URL,
 	altURL *base.URL) error {
-
 	var auth headers.Authorization
 	err := auth.Read(v)
 	if err != nil {
--- a/pkg/headers/keyval.go
+++ b/pkg/headers/keyval.go
@@ -61,7 +61,6 @@ func keyValParse(str string, separator byte) (map[string]string, error) {
 				ret[k] = v
 			} else {
 				ret[k] = ""
-
 			}
 		}

--- a/pkg/rtcpreceiver/rtcpreceiver.go
+++ b/pkg/rtcpreceiver/rtcpreceiver.go
@@ -108,7 +108,6 @@ func (rr *RTCPReceiver) ProcessFrame(ts time.Time, streamType base.StreamType, b
 				// ignore invalid frames (diff = 0) or reordered frames (diff < 0)
 			}
 		}
-
 	} else {
 		// we can afford to unmarshal all RTCP frames
 		// since they are sent with a frequency much lower than the one of RTP frames
--- a/pkg/rtcpreceiver/rtcpreceiver_test.go
+++ b/pkg/rtcpreceiver/rtcpreceiver_test.go
@@ -23,7 +23,7 @@ func TestRTCPReceiverBase(t *testing.T) {
 		OctetCount:  859127,
 	}
 	byts, _ := srPkt.Marshal()
-	ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts := time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTCP, byts)

 	rtpPkt := rtp.Packet{
@@ -38,7 +38,7 @@ func TestRTCPReceiverBase(t *testing.T) {
 		Payload: []byte("\x00\x00"),
 	}
 	byts, _ = rtpPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTP, byts)

 	rtpPkt = rtp.Packet{
@@ -53,7 +53,7 @@ func TestRTCPReceiverBase(t *testing.T) {
 		Payload: []byte("\x00\x00"),
 	}
 	byts, _ = rtpPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 21, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 21, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTP, byts)

 	expectedPkt := rtcp.ReceiverReport{
@@ -68,7 +68,7 @@ func TestRTCPReceiverBase(t *testing.T) {
 		},
 	}
 	expected, _ := expectedPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 22, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 22, 0, time.UTC)
 	require.Equal(t, expected, rr.Report(ts))
 }

@@ -84,7 +84,7 @@ func TestRTCPReceiverOverflow(t *testing.T) {
 		OctetCount:  859127,
 	}
 	byts, _ := srPkt.Marshal()
-	ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts := time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTCP, byts)

 	rtpPkt := rtp.Packet{
@@ -99,7 +99,7 @@ func TestRTCPReceiverOverflow(t *testing.T) {
 		Payload: []byte("\x00\x00"),
 	}
 	byts, _ = rtpPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTP, byts)

 	rtpPkt = rtp.Packet{
@@ -114,7 +114,7 @@ func TestRTCPReceiverOverflow(t *testing.T) {
 		Payload: []byte("\x00\x00"),
 	}
 	byts, _ = rtpPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTP, byts)

 	expectedPkt := rtcp.ReceiverReport{
@@ -129,7 +129,7 @@ func TestRTCPReceiverOverflow(t *testing.T) {
 		},
 	}
 	expected, _ := expectedPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 21, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 21, 0, time.UTC)
 	require.Equal(t, expected, rr.Report(ts))
 }

@@ -145,7 +145,7 @@ func TestRTCPReceiverPacketLost(t *testing.T) {
 		OctetCount:  859127,
 	}
 	byts, _ := srPkt.Marshal()
-	ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts := time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTCP, byts)

 	rtpPkt := rtp.Packet{
@@ -160,7 +160,7 @@ func TestRTCPReceiverPacketLost(t *testing.T) {
 		Payload: []byte("\x00\x00"),
 	}
 	byts, _ = rtpPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTP, byts)

 	rtpPkt = rtp.Packet{
@@ -175,7 +175,7 @@ func TestRTCPReceiverPacketLost(t *testing.T) {
 		Payload: []byte("\x00\x00"),
 	}
 	byts, _ = rtpPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTP, byts)

 	expectedPkt := rtcp.ReceiverReport{
@@ -195,7 +195,7 @@ func TestRTCPReceiverPacketLost(t *testing.T) {
 		},
 	}
 	expected, _ := expectedPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 21, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 21, 0, time.UTC)
 	require.Equal(t, expected, rr.Report(ts))
 }

@@ -211,7 +211,7 @@ func TestRTCPReceiverOverflowPacketLost(t *testing.T) {
 		OctetCount:  859127,
 	}
 	byts, _ := srPkt.Marshal()
-	ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts := time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTCP, byts)

 	rtpPkt := rtp.Packet{
@@ -226,7 +226,7 @@ func TestRTCPReceiverOverflowPacketLost(t *testing.T) {
 		Payload: []byte("\x00\x00"),
 	}
 	byts, _ = rtpPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTP, byts)

 	rtpPkt = rtp.Packet{
@@ -241,7 +241,7 @@ func TestRTCPReceiverOverflowPacketLost(t *testing.T) {
 		Payload: []byte("\x00\x00"),
 	}
 	byts, _ = rtpPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTP, byts)

 	expectedPkt := rtcp.ReceiverReport{
@@ -261,7 +261,7 @@ func TestRTCPReceiverOverflowPacketLost(t *testing.T) {
 		},
 	}
 	expected, _ := expectedPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 21, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 21, 0, time.UTC)
 	require.Equal(t, expected, rr.Report(ts))
 }

@@ -277,7 +277,7 @@ func TestRTCPReceiverReorderedPackets(t *testing.T) {
 		OctetCount:  859127,
 	}
 	byts, _ := srPkt.Marshal()
-	ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts := time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTCP, byts)

 	rtpPkt := rtp.Packet{
@@ -292,7 +292,7 @@ func TestRTCPReceiverReorderedPackets(t *testing.T) {
 		Payload: []byte("\x00\x00"),
 	}
 	byts, _ = rtpPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTP, byts)

 	rtpPkt = rtp.Packet{
@@ -307,7 +307,7 @@ func TestRTCPReceiverReorderedPackets(t *testing.T) {
 		Payload: []byte("\x00\x00"),
 	}
 	byts, _ = rtpPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTP, byts)

 	expectedPkt := rtcp.ReceiverReport{
@@ -322,7 +322,7 @@ func TestRTCPReceiverReorderedPackets(t *testing.T) {
 		},
 	}
 	expected, _ := expectedPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 21, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 21, 0, time.UTC)
 	require.Equal(t, expected, rr.Report(ts))
 }

@@ -338,7 +338,7 @@ func TestRTCPReceiverJitter(t *testing.T) {
 		OctetCount:  859127,
 	}
 	byts, _ := srPkt.Marshal()
-	ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts := time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTCP, byts)

 	rtpPkt := rtp.Packet{
@@ -353,7 +353,7 @@ func TestRTCPReceiverJitter(t *testing.T) {
 		Payload: []byte("\x00\x00"),
 	}
 	byts, _ = rtpPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTP, byts)

 	rtpPkt = rtp.Packet{
@@ -368,7 +368,7 @@ func TestRTCPReceiverJitter(t *testing.T) {
 		Payload: []byte("\x00\x00"),
 	}
 	byts, _ = rtpPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 21, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 21, 0, time.UTC)
 	rr.ProcessFrame(ts, base.StreamTypeRTP, byts)

 	expectedPkt := rtcp.ReceiverReport{
@@ -384,6 +384,6 @@ func TestRTCPReceiverJitter(t *testing.T) {
 		},
 	}
 	expected, _ := expectedPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 22, 0, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 22, 0, time.UTC)
 	require.Equal(t, expected, rr.Report(ts))
 }
--- a/pkg/rtcpsender/rtcpsender_test.go
+++ b/pkg/rtcpsender/rtcpsender_test.go
@@ -26,7 +26,7 @@ func TestRTCPSender(t *testing.T) {
 		Payload: []byte("\x00\x00"),
 	}
 	byts, _ := rtpPkt.Marshal()
-	ts := time.Date(2008, 05, 20, 22, 15, 20, 0, time.UTC)
+	ts := time.Date(2008, 0o5, 20, 22, 15, 20, 0, time.UTC)
 	rs.ProcessFrame(ts, base.StreamTypeRTP, byts)

 	rtpPkt = rtp.Packet{
@@ -41,7 +41,7 @@ func TestRTCPSender(t *testing.T) {
 		Payload: []byte("\x00\x00"),
 	}
 	byts, _ = rtpPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 15, 20, 500000000, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 15, 20, 500000000, time.UTC)
 	rs.ProcessFrame(ts, base.StreamTypeRTP, byts)

 	expectedPkt := rtcp.SenderReport{
@@ -52,6 +52,6 @@ func TestRTCPSender(t *testing.T) {
 		OctetCount:  4,
 	}
 	expected, _ := expectedPkt.Marshal()
-	ts = time.Date(2008, 05, 20, 22, 16, 20, 600000000, time.UTC)
+	ts = time.Date(2008, 0o5, 20, 22, 16, 20, 600000000, time.UTC)
 	require.Equal(t, expected, rs.Report(ts))
 }
--- a/pkg/rtpaac/encoder.go
+++ b/pkg/rtpaac/encoder.go
@@ -69,7 +69,6 @@ func (e *Encoder) Encode(aus [][]byte, firstPTS time.Duration) ([][]byte, error)
 		if e.lenAggregated(batch, au) <= rtpPayloadMaxSize {
 			// add to existing batch
 			batch = append(batch, au)
-
 		} else {
 			// write last batch
 			if batch != nil {
--- a/pkg/rtph264/encoder.go
+++ b/pkg/rtph264/encoder.go
@@ -65,7 +65,6 @@ func (e *Encoder) Encode(nalus [][]byte, pts time.Duration) ([][]byte, error) {
 		if e.lenAggregated(batch, nalu) <= rtpPayloadMaxSize {
 			// add to existing batch
 			batch = append(batch, nalu)
-
 		} else {
 			// write batch
 			if batch != nil {
--- a/pkg/sdp/sdp.go
+++ b/pkg/sdp/sdp.go
@@ -416,8 +416,10 @@ func (s *SessionDescription) unmarshalMediaDescription(value string) error {
 	// Set according to currently registered with IANA
 	// https://tools.ietf.org/html/rfc4566#section-5.14
 	for _, proto := range strings.Split(fields[2], "/") {
-		if i := indexOf(proto, []string{"UDP", "RTP", "AVP", "SAVP", "SAVPF",
-			"MP2T", "TLS", "DTLS", "SCTP", "AVPF", "TCP"}); i == -1 {
+		if i := indexOf(proto, []string{
+			"UDP", "RTP", "AVP", "SAVP", "SAVPF",
+			"MP2T", "TLS", "DTLS", "SCTP", "AVPF", "TCP",
+		}); i == -1 {
 			return fmt.Errorf("%w `%v`", errSDPInvalidNumericValue, fields[2])
 		}
 		newMediaDesc.MediaName.Protos = append(newMediaDesc.MediaName.Protos, proto)
--- a/server.go
+++ b/server.go
@@ -292,7 +292,6 @@ outer:
 		case req := <-s.sessionRequest:
 			if ss, ok := s.sessions[req.id]; ok {
 				ss.request <- req
-
 			} else {
 				if !req.create {
 					req.res <- requestRes{
--- a/server_test.go
+++ b/server_test.go
@@ -151,10 +151,12 @@ func newContainer(image string, name string, args []string) (*container, error)
 	exec.Command("docker", "kill", "gortsplib-test-"+name).Run()
 	exec.Command("docker", "wait", "gortsplib-test-"+name).Run()

-	cmd := []string{"docker", "run",
+	cmd := []string{
+		"docker", "run",
 		"--network=host",
 		"--name=gortsplib-test-" + name,
-		"gortsplib-test-" + image}
+		"gortsplib-test-" + image,
+	}
 	cmd = append(cmd, args...)
 	ecmd := exec.Command(cmd[0], cmd[1:]...)
 	ecmd.Stdout = nil
--- a/serverconn.go
+++ b/serverconn.go
@@ -69,7 +69,6 @@ type ServerConn struct {
 func newServerConn(
 	s *Server,
 	nconn net.Conn) *ServerConn {
-
 	ctx, ctxCancel := context.WithCancel(s.ctx)

 	sc := &ServerConn{
@@ -536,9 +535,11 @@ func (sc *ServerConn) handleRequestOuter(req *base.Request) error {
 	return err
 }

-func (sc *ServerConn) handleRequestInSession(sxID string, req *base.Request, create bool,
+func (sc *ServerConn) handleRequestInSession(
+	sxID string,
+	req *base.Request,
+	create bool,
 ) (*ServerSession, *base.Response, error) {
-
 	// if the session is already linked to this conn, communicate directly with it
 	if sxID != "" {
 		if ss, ok := sc.sessions[sxID]; ok {
--- a/serverhandler.go
+++ b/serverhandler.go
@@ -6,8 +6,7 @@ import (
 )

 // ServerHandler is the interface implemented by all the server handlers.
-type ServerHandler interface {
-}
+type ServerHandler interface{}

 // ServerHandlerOnConnOpenCtx is the context of a connection opening.
 type ServerHandlerOnConnOpenCtx struct {
--- a/serversession.go
+++ b/serversession.go
@@ -19,11 +19,11 @@ const (
 	serverSessionCheckStreamPeriod = 1 * time.Second
 )

-func setupGetTrackIDPathQuery(url *base.URL,
+func setupGetTrackIDPathQuery(
+	url *base.URL,
 	thMode *headers.TransportMode,
 	announcedTracks []ServerSessionAnnouncedTrack,
 	setupPath *string, setupQuery *string) (int, string, string, error) {
-
 	pathAndQuery, ok := url.RTSPPathAndQuery()
 	if !ok {
 		return 0, "", "", liberrors.ErrServerInvalidPath{}
@@ -143,7 +143,6 @@ func newServerSession(
 	id string,
 	author *ServerConn,
 ) *ServerSession {
-
 	ctx, ctxCancel := context.WithCancel(s.ctx)

 	ss := &ServerSession{
@@ -575,7 +574,8 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
 				return &base.Response{
 						StatusCode: base.StatusBadRequest,
 					}, liberrors.ErrServerTransportHeaderWrongInterleavedIDs{
-						Expected: [2]int{(trackID * 2), (1 + trackID*2)}, Value: *inTH.InterleavedIDs}
+						Expected: [2]int{(trackID * 2), (1 + trackID*2)}, Value: *inTH.InterleavedIDs,
+					}
 			}
 		}

@@ -911,7 +911,6 @@ func (ss *ServerSession) WriteFrame(trackID int, streamType StreamType, payload
 				Zone: ss.udpZone,
 				Port: track.udpRTPPort,
 			})
-
 		} else {
 			ss.s.udpRTCPListener.write(payload, &net.UDPAddr{
 				IP:   ss.udpIP,
--- a/serverudpl.go
+++ b/serverudpl.go
@@ -61,7 +61,6 @@ func newServerUDPListener(
 	s *Server,
 	address string,
 	streamType StreamType) (*serverUDPListener, error) {
-
 	tmp, err := s.ListenPacket("udp", address)
 	if err != nil {
 		return nil, err