unistack-org/mdns
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor tweaks for go-micro mdns registry

Browse Source 
* allow to receive multicast on the same host
  via multicast loopback flag
* export SendMulticast function, needed for async
  notification on registry updates

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2019-06-21 23:37:13 +03:00
parent 2304dca2ca
commit ad8a5c5b3e
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client.go
View File

@ -211,16 +211,12 @@ func newClient() (*client, error) {
return nil, fmt.Errorf("failed to bind to any multicast udp port") return nil, fmt.Errorf("failed to bind to any multicast udp port")
} }
if mconn4 == nil {
mconn4 = &net.UDPConn{}
}
if mconn6 == nil {
mconn6 = &net.UDPConn{}
}
p1 := ipv4.NewPacketConn(mconn4) p1 := ipv4.NewPacketConn(mconn4)
p2 := ipv6.NewPacketConn(mconn6) p2 := ipv6.NewPacketConn(mconn6)
p1.SetMulticastLoopback(true)
p2.SetMulticastLoopback(true)
ifaces, err := net.Interfaces() ifaces, err := net.Interfaces()
if err != nil { if err != nil {
return nil, err return nil, err

8
server.go
View File

@ -358,7 +358,7 @@ func (s *Server) probe() {
randomizer := rand.New(rand.NewSource(time.Now().UnixNano())) randomizer := rand.New(rand.NewSource(time.Now().UnixNano()))
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
if err := s.multicastResponse(q); err != nil { if err := s.SendMulticast(q); err != nil {
log.Println("[ERR] mdns: failed to send probe:", err.Error()) log.Println("[ERR] mdns: failed to send probe:", err.Error())
} }
time.Sleep(time.Duration(randomizer.Intn(250)) * time.Millisecond) time.Sleep(time.Duration(randomizer.Intn(250)) * time.Millisecond)
@ -384,7 +384,7 @@ func (s *Server) probe() {
timeout := 1 * time.Second timeout := 1 * time.Second
timer := time.NewTimer(timeout) timer := time.NewTimer(timeout)
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
if err := s.multicastResponse(resp); err != nil { if err := s.SendMulticast(resp); err != nil {
log.Println("[ERR] mdns: failed to send announcement:", err.Error()) log.Println("[ERR] mdns: failed to send announcement:", err.Error())
} }
select { select {
@ -399,7 +399,7 @@ func (s *Server) probe() {
} }
// multicastResponse us used to send a multicast response packet // multicastResponse us used to send a multicast response packet
func (s *Server) multicastResponse(msg *dns.Msg) error { func (s *Server) SendMulticast(msg *dns.Msg) error {
buf, err := msg.Pack() buf, err := msg.Pack()
if err != nil { if err != nil {
return err return err
@ -449,5 +449,5 @@ func (s *Server) unregister() error {
resp.MsgHdr.Response = true resp.MsgHdr.Response = true
resp.Answer = append(resp.Answer, s.config.Zone.Records(q.Question[0])...) resp.Answer = append(resp.Answer, s.config.Zone.Records(q.Question[0])...)
return s.multicastResponse(resp) return s.SendMulticast(resp)
} }