Skip to content

Commit

Permalink
Remove duplicated code in Agent: closeMDNSConn()
Browse files Browse the repository at this point in the history
  • Loading branch information
stv0g committed Apr 20, 2023
1 parent c596a7c commit 96ef175
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -334,13 +334,6 @@ func NewAgent(config *AgentConfig) (*Agent, error) { //nolint:gocognit
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() {
if a.mDNSConn != nil {
if mdnsCloseErr := a.mDNSConn.Close(); mdnsCloseErr != nil {
log.Warnf("Failed to close mDNS: %v", mdnsCloseErr)
}
}
}

config.initWithDefaults(a)

Expand All @@ -350,17 +343,17 @@ func NewAgent(config *AgentConfig) (*Agent, error) { //nolint:gocognit
a.buf.SetLimitSize(maxBufferSize)

if a.lite && (len(a.candidateTypes) != 1 || a.candidateTypes[0] != CandidateTypeHost) {
closeMDNSConn()
a.closeMulticastConn()
return nil, ErrLiteUsingNonHostCandidates
}

if config.Urls != nil && len(config.Urls) > 0 && !containsCandidateType(CandidateTypeServerReflexive, a.candidateTypes) && !containsCandidateType(CandidateTypeRelay, a.candidateTypes) {
closeMDNSConn()
a.closeMulticastConn()
return nil, ErrUselessUrlsProvided
}

if err = config.initExtIPMapping(a); err != nil {
closeMDNSConn()
a.closeMulticastConn()
return nil, err
}

Expand All @@ -369,7 +362,7 @@ func NewAgent(config *AgentConfig) (*Agent, error) { //nolint:gocognit

// Restart is also used to initialize the agent for the first time
if err := a.Restart(config.LocalUfrag, config.LocalPwd); err != nil {
closeMDNSConn()
a.closeMulticastConn()
_ = a.Close()
return nil, err
}
Expand Down

0 comments on commit 96ef175

Please sign in to comment.