import (
"context"
+ "fmt"
"github.com/grandcat/zeroconf"
)
const (
instanceName = "vapord"
- serviceName = "lanDiscover"
+ serviceName = "vapor%sLanDiscover"
domainName = "local"
)
// Protocol decoration ZeroConf,which is a pure Golang library
// that employs Multicast DNS-SD.
type Protocol struct {
- entries chan *zeroconf.ServiceEntry
- server *zeroconf.Server
- quite chan struct{}
+ entries chan *zeroconf.ServiceEntry
+ server *zeroconf.Server
+ serviceName string
+ quite chan struct{}
}
// NewProtocol create a specific Protocol.
-func NewProtocol() *Protocol {
+func NewProtocol(chainID string) *Protocol {
return &Protocol{
- entries: make(chan *zeroconf.ServiceEntry),
- quite: make(chan struct{}),
+ entries: make(chan *zeroconf.ServiceEntry),
+ serviceName: fmt.Sprintf(serviceName, chainID),
+ quite: make(chan struct{}),
}
}
-func (m *Protocol) getLanPeerLoop(event chan LANPeerEvent) {
+func (p *Protocol) getLanPeerLoop(event chan LANPeerEvent) {
for {
select {
- case entry := <-m.entries:
+ case entry := <-p.entries:
event <- LANPeerEvent{IP: entry.AddrIPv4, Port: entry.Port}
- case <-m.quite:
+ case <-p.quite:
return
}
}
}
-func (m *Protocol) registerService(port int) error {
+func (p *Protocol) registerService(port int) error {
var err error
- m.server, err = zeroconf.Register(instanceName, serviceName, domainName, port, nil, nil)
+ p.server, err = zeroconf.Register(instanceName, p.serviceName, domainName, port, nil, nil)
return err
}
return err
}
- return resolver.Browse(context.Background(), serviceName, domainName, m.entries)
+ return resolver.Browse(context.Background(), m.serviceName, domainName, m.entries)
}
-func (m *Protocol) stopResolver() {
- close(m.quite)
+func (p *Protocol) stopResolver() {
+ close(p.quite)
}
-func (m *Protocol) stopService() {
- if m.server != nil {
- m.server.Shutdown()
+func (p *Protocol) stopService() {
+ if p.server != nil {
+ p.server.Shutdown()
}
}
}
// no need for lanDiscv, but passing &mdns.LANDiscover{} will cause NilPointer
- lanDiscv := mdns.NewLANDiscover(mdns.NewProtocol(), int(l.ExternalAddress().Port))
+ lanDiscv := mdns.NewLANDiscover(mdns.NewProtocol(m.nodeCfg.ChainID), int(l.ExternalAddress().Port))
m.sw, err = p2p.NewSwitch(m.nodeCfg, discv, lanDiscv, l, m.privKey, listenAddr, m.cfg.NetworkID)
if err != nil {
return err