From 96ef175a89372b82e80f07cd6051126b2d272473 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 18 Apr 2023 18:08:11 +0200 Subject: [PATCH] Remove duplicated code in Agent: closeMDNSConn() --- agent.go | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/agent.go b/agent.go index ba0bf53..a64438d 100644 --- a/agent.go +++ b/agent.go @@ -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) @@ -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 } @@ -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 }