update golangci-lint

.github/workflows/lint.yml

@@ -17,7 +17,7 @@ jobs:
 
     - uses: golangci/golangci-lint-action@v2
       with:
-        version: v1.33
+        version: v1.38
 
   go-mod-tidy:
     name: go-mod-tidy

.golangci.yml

@@ -1,6 +1,7 @@
 
 linters:
   enable:
+  - gocritic
   - gofmt
   - golint
   - misspell

Makefile

@@ -1,6 +1,6 @@
 
 BASE_IMAGE = amd64/golang:1.15-alpine3.12
-LINT_IMAGE = golangci/golangci-lint:v1.33.0
+LINT_IMAGE = golangci/golangci-lint:v1.38.0
 
 .PHONY: $(shell ls)
 

clientconn.go

@@ -603,13 +603,11 @@ func (c *ClientConn) Setup(mode headers.TransportMode, track *Track,
 			}
 		}
 
-	} else {
+	} else if thRes.InterleavedIds == nil ||
-		if thRes.InterleavedIds == nil ||
+		thRes.InterleavedIds[0] != th.InterleavedIds[0] ||
-			(*thRes.InterleavedIds)[0] != (*th.InterleavedIds)[0] ||
+		thRes.InterleavedIds[1] != th.InterleavedIds[1] {
-			(*thRes.InterleavedIds)[1] != (*th.InterleavedIds)[1] {
+		return nil, fmt.Errorf("transport header does not have interleaved ids %v (%s)",
-			return nil, fmt.Errorf("transport header does not have interleaved ids %v (%s)",
+			*th.InterleavedIds, res.Header["Transport"])
-				*th.InterleavedIds, res.Header["Transport"])
-		}
 	}
 
 	clockRate, _ := track.ClockRate()
@@ -633,7 +631,7 @@ func (c *ClientConn) Setup(mode headers.TransportMode, track *Track,
 		rtpListener.remoteIP = c.nconn.RemoteAddr().(*net.TCPAddr).IP
 		rtpListener.remoteZone = c.nconn.RemoteAddr().(*net.TCPAddr).Zone
 		if thRes.ServerPorts != nil {
-			rtpListener.remotePort = (*thRes.ServerPorts)[0]
+			rtpListener.remotePort = thRes.ServerPorts[0]
 		}
 		rtpListener.trackID = track.ID
 		rtpListener.streamType = StreamTypeRTP
@@ -642,7 +640,7 @@ func (c *ClientConn) Setup(mode headers.TransportMode, track *Track,
 		rtcpListener.remoteIP = c.nconn.RemoteAddr().(*net.TCPAddr).IP
 		rtcpListener.remoteZone = c.nconn.RemoteAddr().(*net.TCPAddr).Zone
 		if thRes.ServerPorts != nil {
-			rtcpListener.remotePort = (*thRes.ServerPorts)[1]
+			rtcpListener.remotePort = thRes.ServerPorts[1]
 		}
 		rtcpListener.trackID = track.ID
 		rtcpListener.streamType = StreamTypeRTCP

pkg/auth/validator.go

@@ -101,7 +101,8 @@ func (va *Validator) ValidateHeader(v base.HeaderValue, method base.Method, ur *
 
 	v0 := v[0]
 
-	if strings.HasPrefix(v0, "Basic ") {
+	switch {
+	case strings.HasPrefix(v0, "Basic "):
 		inResponse := v0[len("Basic "):]
 
 		tmp, err := base64.StdEncoding.DecodeString(inResponse)
@@ -134,7 +135,7 @@ func (va *Validator) ValidateHeader(v base.HeaderValue, method base.Method, ur *
 			}
 		}
 
-	} else if strings.HasPrefix(v0, "Digest ") {
+	case strings.HasPrefix(v0, "Digest "):
 		var auth headers.Auth
 		err := auth.Read(base.HeaderValue{v0})
 		if err != nil {
@@ -193,7 +194,7 @@ func (va *Validator) ValidateHeader(v base.HeaderValue, method base.Method, ur *
 			return fmt.Errorf("wrong response")
 		}
 
-	} else {
+	default:
 		return fmt.Errorf("unsupported authorization header")
 	}
 

pkg/headers/transport.go

@@ -131,11 +131,12 @@ func (h *Transport) Read(v base.HeaderValue) error {
 	}
 
 	for _, t := range parts {
-		if strings.HasPrefix(t, "destination=") {
+		switch {
+		case strings.HasPrefix(t, "destination="):
 			v := t[len("destination="):]
 			h.Destination = &v
 
-		} else if strings.HasPrefix(t, "ttl=") {
+		case strings.HasPrefix(t, "ttl="):
 			v, err := strconv.ParseUint(t[len("ttl="):], 10, 64)
 			if err != nil {
 				return err
@@ -143,35 +144,35 @@ func (h *Transport) Read(v base.HeaderValue) error {
 			vu := uint(v)
 			h.TTL = &vu
 
-		} else if strings.HasPrefix(t, "port=") {
+		case strings.HasPrefix(t, "port="):
 			ports, err := parsePorts(t[len("port="):])
 			if err != nil {
 				return err
 			}
 			h.Ports = ports
 
-		} else if strings.HasPrefix(t, "client_port=") {
+		case strings.HasPrefix(t, "client_port="):
 			ports, err := parsePorts(t[len("client_port="):])
 			if err != nil {
 				return err
 			}
 			h.ClientPorts = ports
 
-		} else if strings.HasPrefix(t, "server_port=") {
+		case strings.HasPrefix(t, "server_port="):
 			ports, err := parsePorts(t[len("server_port="):])
 			if err != nil {
 				return err
 			}
 			h.ServerPorts = ports
 
-		} else if strings.HasPrefix(t, "interleaved=") {
+		case strings.HasPrefix(t, "interleaved="):
 			ports, err := parsePorts(t[len("interleaved="):])
 			if err != nil {
 				return err
 			}
 			h.InterleavedIds = ports
 
-		} else if strings.HasPrefix(t, "mode=") {
+		case strings.HasPrefix(t, "mode="):
 			str := strings.ToLower(t[len("mode="):])
 			str = strings.TrimPrefix(str, "\"")
 			str = strings.TrimSuffix(str, "\"")

serverconn.go

@@ -736,8 +736,8 @@ func (sc *ServerConn) handleRequest(req *base.Request) (*base.Response, error) {
 					}, fmt.Errorf("transport header does not contain the interleaved field")
 				}
 
-				if (*th.InterleavedIds)[0] != (trackID*2) ||
+				if th.InterleavedIds[0] != (trackID*2) ||
-					(*th.InterleavedIds)[1] != (1+trackID*2) {
+					th.InterleavedIds[1] != (1+trackID*2) {
 					return &base.Response{
 							StatusCode: base.StatusBadRequest,
 						}, fmt.Errorf("wrong interleaved ids, expected [%v %v], got %v",
@@ -798,8 +798,7 @@ func (sc *ServerConn) handleRequest(req *base.Request) (*base.Response, error) {
 				}
 			}
 
-			switch sc.state {
+			if sc.state == ServerConnStateInitial {
-			case ServerConnStateInitial:
 				sc.state = ServerConnStatePrePlay
 				sc.setupPath = &path
 				sc.setupQuery = &query
@@ -1057,7 +1056,8 @@ func (sc *ServerConn) backgroundRead() error {
 		}
 
 		// start background write
-		if sc.doEnableFrames {
+		switch {
+		case sc.doEnableFrames:
 			sc.doEnableFrames = false
 			sc.framesEnabled = true
 
@@ -1081,11 +1081,11 @@ func (sc *ServerConn) backgroundRead() error {
 			go sc.backgroundWrite()
 
 			// write to background write
-		} else if sc.framesEnabled {
+		case sc.framesEnabled:
 			sc.frameRingBuffer.Push(res)
 
 			// write directly
-		} else {
+		default:
 			sc.nconn.SetWriteDeadline(time.Now().Add(sc.conf.WriteTimeout))
 			res.Write(sc.bw)
 		}