zecfoundation
/
dnsseeder
mirror of https://github.com/ZcashFoundation/dnsseeder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ref: adapt to new `btcsuite/btcd/` v0.24.0

This commit is contained in:
Gustavo Valverde 2024-02-27 10:20:42 +00:00
parent 1807bcb392
commit c9a566fcb4
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zcash/client.go
View File

@ -88,7 +88,7 @@ type Seeder struct {
addrBook *AddressBook
// The queue of incoming potential addresses
addrQueue chan *wire.NetAddress
addrQueue chan *wire.NetAddressV2
}
func NewSeeder(network network.Network) (*Seeder, error) {
@ -108,7 +108,7 @@ func NewSeeder(network network.Network) (*Seeder, error) {
pendingPeers: NewPeerMap(),
livePeers: NewPeerMap(),
addrBook: NewAddressBook(),
addrQueue: make(chan *wire.NetAddress, incomingAddressBufferSize),
addrQueue: make(chan *wire.NetAddressV2, incomingAddressBufferSize),
}
// The seeder only acts on verack, addr and addrv2 messages.
@ -144,7 +144,7 @@ func newTestSeeder(network network.Network) (*Seeder, error) {
pendingPeers: NewPeerMap(),
livePeers: NewPeerMap(),
addrBook: NewAddressBook(),
addrQueue: make(chan *wire.NetAddress, incomingAddressBufferSize),
addrQueue: make(chan *wire.NetAddressV2, incomingAddressBufferSize),
}
newSeeder.config.Listeners.OnVerAck = newSeeder.onVerAck
@ -170,10 +170,10 @@ func newSeederPeerConfig(magic network.Network, template *peer.Config) (*peer.Co
switch magic {
case network.Mainnet, network.Regtest:
newPeerConfig.MinAcceptableProtocolVersion = MinAcceptableProtocolVersionMainnet
newPeerConfig.ProtocolVersion = MinAcceptableProtocolVersionMainnet
break
case network.Testnet:
newPeerConfig.MinAcceptableProtocolVersion = MinAcceptableProtocolVersionTestnet
newPeerConfig.ProtocolVersion = MinAcceptableProtocolVersionTestnet
break
}
@ -362,7 +362,7 @@ func (s *Seeder) RequestAddresses() int {
go func() {
defer wg.Done()
var na *wire.NetAddress
var na *wire.NetAddressV2
for {
select {
case next := <-s.addrQueue:
@ -375,21 +375,21 @@ func (s *Seeder) RequestAddresses() int {
_, denied := DeniedPorts[na.Port]
if denied || (!addrmgr.IsRoutable(na) && !s.config.AllowSelfConns) {
s.logger.Printf("Got bad addr %s:%d from peer %s", na.IP, na.Port, "<placeholder>")
s.logger.Printf("Got bad addr %s:%d from peer %s", na.Addr.String(), na.Port, "<placeholder>")
// TODO blacklist peers who give us crap addresses
//s.DisconnectAndBlacklist(peerKeyFromPeer(p))
continue
}
potentialPeer := peerKeyFromNA(na)
potentialPeer := peerKeyFromNAV2(na)
if s.addrBook.IsKnown(potentialPeer) {
s.logger.Printf("Already knew about %s:%d", na.IP, na.Port)
s.logger.Printf("Already knew about %s:%d", na.Addr.String(), na.Port)
continue
}
portString := strconv.Itoa(int(na.Port))
newPeer, err := s.Connect(na.IP.String(), portString)
newPeer, err := s.Connect(na.Addr.String(), portString)
if err != nil {
if err == ErrRepeatConnection {
@ -399,7 +399,7 @@ func (s *Seeder) RequestAddresses() int {
// Blacklist the potential peer. We might try to connect again later,
// since we assume IsRoutable filtered out the truly wrong ones.
s.logger.Printf("Got unusable peer %s:%d. Error: %s", na.IP, na.Port, err)
s.logger.Printf("Got unusable peer %s:%d. Error: %s", na.Addr.String(), na.Port, err)
s.addrBook.Blacklist(potentialPeer)
continue
}
@ -407,7 +407,7 @@ func (s *Seeder) RequestAddresses() int {
// Ask the newly discovered peer if they know anyone we haven't met yet.
newPeer.QueueMessage(wire.NewMsgGetAddr(), nil)
s.logger.Printf("Successfully learned about %s:%d.", na.IP, na.Port)
s.logger.Printf("Successfully learned about %s:%d.", na.Addr.String(), na.Port)
atomic.AddInt32(&peerCount, 1)
s.addrBook.Add(potentialPeer)
}

2
zcash/peer_map.go
View File

@ -27,7 +27,7 @@ func peerKeyFromNA(na *wire.NetAddress) PeerKey {
func peerKeyFromNAV2(na *wire.NetAddressV2) PeerKey {
portString := strconv.Itoa(int(na.Port))
return PeerKey(net.JoinHostPort(na.IP.String(), portString))
return PeerKey(net.JoinHostPort(na.Addr.String(), portString))
}
// PeerMap is a typed wrapper for a sync.Map. Its keys are PeerKeys (host:port