From 95ba67631460633acf7505c9c2bd747570ba55a2 Mon Sep 17 00:00:00 2001 From: Eric Daniels Date: Wed, 1 Feb 2023 14:10:55 -0500 Subject: [PATCH] Update module github.com/pion/mdns to v0.0.6 Include MTU fix --- agent.go | 4 ++-- go.mod | 2 +- go.sum | 5 ++--- util.go | 12 ++++++++++++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/agent.go b/agent.go index dcca6c5..0d966af 100644 --- a/agent.go +++ b/agent.go @@ -770,8 +770,8 @@ func (a *Agent) resolveAndAddMulticastCandidate(c *CandidateHost) { return } - ip, _, _, _ := parseAddr(src) //nolint:dogsled - if ip == nil { + ip, ipOk := parseMulticastAnswerAddr(src) + if !ipOk { a.log.Warnf("Failed to discover mDNS candidate %s: failed to parse IP", c.Address()) return } diff --git a/go.mod b/go.mod index e814190..ade34ec 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/kr/pretty v0.1.0 // indirect github.com/pion/dtls/v2 v2.1.5 github.com/pion/logging v0.2.2 - github.com/pion/mdns v0.0.5 + github.com/pion/mdns v0.0.6 github.com/pion/randutil v0.1.0 github.com/pion/stun v0.4.0 github.com/pion/transport v0.14.1 diff --git a/go.sum b/go.sum index 4df067b..5ad9f04 100644 --- a/go.sum +++ b/go.sum @@ -12,8 +12,8 @@ github.com/pion/dtls/v2 v2.1.5 h1:jlh2vtIyUBShchoTDqpCCqiYCyRFJ/lvf/gQ8TALs+c= github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= -github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw= -github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g= +github.com/pion/mdns v0.0.6 h1:HgGMFWk8Ne3sVIRNzmXZjZQAt5lSV5aak1ckI5Gcz2I= +github.com/pion/mdns v0.0.6/go.mod h1:4iP2UbeFhLI/vWju/bw6ZfwjJzk0z8DNValjGxR/dD8= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= @@ -51,7 +51,6 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= diff --git a/util.go b/util.go index 7321a2e..5abede7 100644 --- a/util.go +++ b/util.go @@ -44,6 +44,18 @@ func isZeros(ip net.IP) bool { return true } +func parseMulticastAnswerAddr(in net.Addr) (net.IP, bool) { + switch addr := in.(type) { + case *net.IPAddr: + return addr.IP, true + case *net.UDPAddr: + return addr.IP, true + case *net.TCPAddr: + return addr.IP, true + } + return nil, false +} + func parseAddr(in net.Addr) (net.IP, int, NetworkType, bool) { switch addr := in.(type) { case *net.UDPAddr: