Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-06-07 22:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NOD-691] Remove addTrying from AddrManager. (#608)

Browse Source
This commit is contained in:
stasatdaglabs 2020-01-28 13:57:02 +02:00 committed by Svarog
parent 607b838ded
commit aadbebb720
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addrmgr/addrmanager.go
View File

@ -42,7 +42,6 @@ type AddrManager struct {
addrNewFullNodes newBucket addrNewFullNodes newBucket
addrTried map[subnetworkid.SubnetworkID]*triedBucket addrTried map[subnetworkid.SubnetworkID]*triedBucket
addrTriedFullNodes triedBucket addrTriedFullNodes triedBucket
addrTrying map[*KnownAddress]bool
started int32 started int32
shutdown int32 shutdown int32
wg sync.WaitGroup wg sync.WaitGroup
@ -869,7 +868,6 @@ func (a *AddrManager) AddressCache(includeAllSubnetworks bool, subnetworkID *sub
// reset resets the address manager by reinitialising the random source // reset resets the address manager by reinitialising the random source
// and allocating fresh empty bucket storage. // and allocating fresh empty bucket storage.
func (a *AddrManager) reset() { func (a *AddrManager) reset() {
a.addrIndex = make(map[string]*KnownAddress) a.addrIndex = make(map[string]*KnownAddress)
// fill key with bytes from a good random source. // fill key with bytes from a good random source.
@ -888,8 +886,6 @@ func (a *AddrManager) reset() {
} }
a.nNewFullNodes = 0 a.nNewFullNodes = 0
a.nTriedFullNodes = 0 a.nTriedFullNodes = 0
a.addrTrying = make(map[*KnownAddress]bool)
} }
// HostToNetAddress returns a netaddress given a host address. If // HostToNetAddress returns a netaddress given a host address. If
@ -937,13 +933,6 @@ func (a *AddrManager) GetAddress() *KnownAddress {
a.addrNew[subnetworkID], a.nNew[subnetworkID]) a.addrNew[subnetworkID], a.nNew[subnetworkID])
} }
if knownAddress != nil {
if a.addrTrying[knownAddress] {
return nil
}
a.addrTrying[knownAddress] = true
}
return knownAddress return knownAddress
} }
@ -1028,8 +1017,6 @@ func (a *AddrManager) Attempt(addr *wire.NetAddress) {
// set last tried time to now // set last tried time to now
ka.attempts++ ka.attempts++
ka.lastattempt = time.Now() ka.lastattempt = time.Now()
delete(a.addrTrying, ka)
} }
// Connected Marks the given address as currently connected and working at the // Connected Marks the given address as currently connected and working at the