Skip to content

Commit

Permalink
Fix linter warnings
Browse files Browse the repository at this point in the history
Fix linter warnings
  • Loading branch information
stv0g committed Feb 8, 2023
1 parent 0194bd6 commit ef54990
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 12 deletions.
3 changes: 1 addition & 2 deletions agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
1 change: 1 addition & 0 deletions candidate_peer_reflexive.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Package ice ...
//
//nolint:dupl
package ice

Expand Down
1 change: 1 addition & 0 deletions candidate_server_reflexive.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Package ice ...
//
//nolint:dupl
package ice

Expand Down
7 changes: 4 additions & 3 deletions examples/ping-pong/main.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Package main implements a simple example demonstrating a Pion-to-Pion ICE connection
package main

import (
Expand All @@ -14,7 +15,7 @@ import (
"github.com/pion/randutil"
)

//nolint
// nolint:gochecknoglobals
var (
isControlling bool
iceAgent *ice.Agent
Expand Down Expand Up @@ -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)
}
}
Expand All @@ -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)
}
}()
Expand Down
14 changes: 8 additions & 6 deletions gather.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion udp_mux_multi.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit ef54990

Please sign in to comment.