From ef5499022385a7ee6cb7943d923b0fdea7098294 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Tue, 31 Jan 2023 15:28:09 +0100
Subject: [PATCH] Fix linter warnings

Fix linter warnings
---
 agent.go                      |  3 +--
 candidate_peer_reflexive.go   |  1 +
 candidate_server_reflexive.go |  1 +
 examples/ping-pong/main.go    |  7 ++++---
 gather.go                     | 14 ++++++++------
 udp_mux_multi.go              |  2 +-
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/agent.go b/agent.go
index ebeabc2..66ae3f7 100644
--- a/agent.go
+++ b/agent.go
@@ -328,10 +328,9 @@ func NewAgent(config *AgentConfig) (*Agent, error) { //nolint:gocognit
 		}
 	}
 
-	a.mDNSConn, mDNSMode, err = createMulticastDNS(a.net, mDNSMode, mDNSName, log)
 	// Opportunistic mDNS: If we can't open the connection, that's ok: we
 	// can continue without it.
-	if err != nil {
+	if a.mDNSConn, a.mDNSMode, err = createMulticastDNS(a.net, mDNSMode, mDNSName, log); err != nil {
 		log.Warnf("Failed to initialize mDNS %s: %v", mDNSName, err)
 	}
 	closeMDNSConn := func() {
diff --git a/candidate_peer_reflexive.go b/candidate_peer_reflexive.go
index 0b330d1..683abd0 100644
--- a/candidate_peer_reflexive.go
+++ b/candidate_peer_reflexive.go
@@ -1,4 +1,5 @@
 // Package ice ...
+//
 //nolint:dupl
 package ice
 
diff --git a/candidate_server_reflexive.go b/candidate_server_reflexive.go
index 125a537..35de38a 100644
--- a/candidate_server_reflexive.go
+++ b/candidate_server_reflexive.go
@@ -1,4 +1,5 @@
 // Package ice ...
+//
 //nolint:dupl
 package ice
 
diff --git a/examples/ping-pong/main.go b/examples/ping-pong/main.go
index b08644f..439caa0 100644
--- a/examples/ping-pong/main.go
+++ b/examples/ping-pong/main.go
@@ -1,3 +1,4 @@
+// Package main implements a simple example demonstrating a Pion-to-Pion ICE connection
 package main
 
 import (
@@ -14,7 +15,7 @@ import (
 	"github.com/pion/randutil"
 )
 
-//nolint
+// nolint:gochecknoglobals
 var (
 	isControlling                 bool
 	iceAgent                      *ice.Agent
@@ -43,7 +44,7 @@ func remoteCandidate(w http.ResponseWriter, r *http.Request) {
 		panic(err)
 	}
 
-	if err := iceAgent.AddRemoteCandidate(c); err != nil {
+	if err := iceAgent.AddRemoteCandidate(c); err != nil { //nolint:contextcheck
 		panic(err)
 	}
 }
@@ -69,7 +70,7 @@ func main() { //nolint
 	http.HandleFunc("/remoteAuth", remoteAuth)
 	http.HandleFunc("/remoteCandidate", remoteCandidate)
 	go func() {
-		if err = http.ListenAndServe(fmt.Sprintf(":%d", localHTTPPort), nil); err != nil {
+		if err = http.ListenAndServe(fmt.Sprintf(":%d", localHTTPPort), nil); err != nil { //nolint:gosec
 			panic(err)
 		}
 	}()
diff --git a/gather.go b/gather.go
index e0e3264..42ff367 100644
--- a/gather.go
+++ b/gather.go
@@ -622,9 +622,9 @@ func (a *Agent) gatherCandidatesRelay(ctx context.Context, urls []*URL) { //noli
 				relayProtocol = "dtls"
 				locConn = &fakePacketConn{conn}
 			case url.Proto == ProtoTypeTCP && url.Scheme == SchemeTypeTURNS:
-				tcpAddr, err := a.net.ResolveTCPAddr(NetworkTypeTCP4.String(), TURNServerAddr)
-				if err != nil {
-					a.log.Warnf("Failed to resolve relay address %s: %v", TURNServerAddr, err)
+				tcpAddr, resolvErr := a.net.ResolveTCPAddr(NetworkTypeTCP4.String(), TURNServerAddr)
+				if resolvErr != nil {
+					a.log.Warnf("Failed to resolve relay address %s: %v", TURNServerAddr, resolvErr)
 					return
 				}
 
@@ -638,9 +638,11 @@ func (a *Agent) gatherCandidatesRelay(ctx context.Context, urls []*URL) { //noli
 					InsecureSkipVerify: a.insecureSkipVerify, //nolint:gosec
 				})
 
-				if err := conn.HandshakeContext(ctx); err != nil {
-					tcpConn.Close()
-					a.log.Warnf("Failed to connect to relay: %v", dialErr)
+				if hsErr := conn.HandshakeContext(ctx); hsErr != nil {
+					if closeErr := tcpConn.Close(); closeErr != nil {
+						a.log.Errorf("Failed to close relay connection: %v", closeErr)
+					}
+					a.log.Warnf("Failed to connect to relay: %v", hsErr)
 					return
 				}
 
diff --git a/udp_mux_multi.go b/udp_mux_multi.go
index a2297ed..e84a5cd 100644
--- a/udp_mux_multi.go
+++ b/udp_mux_multi.go
@@ -218,7 +218,7 @@ func UDPMuxFromPortWithLoopback() UDPMuxFromPortOption {
 	}
 }
 
-// UDPMuxFromPortWithLoopback set loopback interface should be included
+// UDPMuxFromPortWithNet set loopback interface should be included
 func UDPMuxFromPortWithNet(n transport.Net) UDPMuxFromPortOption {
 	return &udpMuxFromPortOption{
 		f: func(p *multiUDPMuxFromPortParam) {