yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-11-04 11:15:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

deduplicate the list of nodes to visit in a search (keeping newest rumors)

Browse source
This commit is contained in:
Arceliar 2020-02-06 20:47:53 -06:00
parent 1104d12540
commit 3faa0b2854
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/yggdrasil/search.go
View file

@ -97,8 +97,19 @@ func (sinfo *searchInfo) handleDHTRes(res *dhtRes) {
// Adds the information from a dhtRes to an ongoing search. // Adds the information from a dhtRes to an ongoing search.
// Info about a node that has already been visited is not re-added to the search. // Info about a node that has already been visited is not re-added to the search.
func (sinfo *searchInfo) addToSearch(res *dhtRes) { func (sinfo *searchInfo) addToSearch(res *dhtRes) {
// Add to search // Get a (deduplicated) list of known nodes to check
temp := make(map[crypto.NodeID]*dhtInfo, len(sinfo.toVisit)+len(res.Infos))
for _, info := range sinfo.toVisit {
temp[*info.getNodeID()] = info
}
// Add new results to the list
for _, info := range res.Infos { for _, info := range res.Infos {
temp[*info.getNodeID()] = info
}
// Move list to toVisit
delete(temp, sinfo.visited)
sinfo.toVisit = sinfo.toVisit[:0]
for _, info := range temp {
sinfo.toVisit = append(sinfo.toVisit, info) sinfo.toVisit = append(sinfo.toVisit, info)
} }
// Sort // Sort
@ -106,9 +117,9 @@ func (sinfo *searchInfo) addToSearch(res *dhtRes) {
// Should return true if i is closer to the destination than j // Should return true if i is closer to the destination than j
return dht_ordered(&sinfo.dest, sinfo.toVisit[i].getNodeID(), sinfo.toVisit[j].getNodeID()) return dht_ordered(&sinfo.dest, sinfo.toVisit[i].getNodeID(), sinfo.toVisit[j].getNodeID())
}) })
// Remove anything too far away // Remove anything too far away to be useful
for idx, info := range sinfo.toVisit { for idx, info := range sinfo.toVisit {
if *info.getNodeID() == sinfo.visited || !dht_ordered(&sinfo.dest, info.getNodeID(), &sinfo.visited) { if !dht_ordered(&sinfo.dest, info.getNodeID(), &sinfo.visited) {
sinfo.toVisit = sinfo.toVisit[:idx] sinfo.toVisit = sinfo.toVisit[:idx]
break break
} }