cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-22 15:20:30 +00:00
Code Releases Activity

constant space searches that should play nicer if searching for an unreachable destination

Browse Source
This commit is contained in:
Arceliar 2020-01-04 16:08:48 -06:00
parent 201dbec63d
commit 8513f8f4dc
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/yggdrasil/search.go
View File

@ -37,7 +37,7 @@ type searchInfo struct {
mask crypto.NodeID mask crypto.NodeID
time time.Time time time.Time
toVisit []*dhtInfo toVisit []*dhtInfo
visited map[crypto.NodeID]bool visited crypto.NodeID // Closest address visited so far
callback func(*sessionInfo, error) callback func(*sessionInfo, error)
// TODO context.Context for timeout and cancellation // TODO context.Context for timeout and cancellation
} }
@ -93,12 +93,16 @@ func (sinfo *searchInfo) handleDHTRes(res *dhtRes) {
func (sinfo *searchInfo) addToSearch(res *dhtRes) { func (sinfo *searchInfo) addToSearch(res *dhtRes) {
// Add responses to toVisit if closer to dest than the res node // Add responses to toVisit if closer to dest than the res node
from := dhtInfo{key: res.Key, coords: res.Coords} from := dhtInfo{key: res.Key, coords: res.Coords}
sinfo.visited[*from.getNodeID()] = true if dht_ordered(&sinfo.dest, from.getNodeID(), &sinfo.visited) {
// Closer to the destination, so update visited
sinfo.visited = *from.getNodeID()
}
for _, info := range res.Infos { for _, info := range res.Infos {
if *info.getNodeID() == sinfo.searches.router.dht.nodeID || sinfo.visited[*info.getNodeID()] { if *info.getNodeID() == sinfo.visited {
// dht_ordered could return true here, but we want to skip it in this case
continue continue
} }
if dht_ordered(&sinfo.dest, info.getNodeID(), from.getNodeID()) { if dht_ordered(&sinfo.dest, info.getNodeID(), &sinfo.visited) {
// Response is closer to the destination // Response is closer to the destination
sinfo.toVisit = append(sinfo.toVisit, info) sinfo.toVisit = append(sinfo.toVisit, info)
} }
@ -148,7 +152,7 @@ func (sinfo *searchInfo) continueSearch() {
// Calls create search, and initializes the iterative search parts of the struct before returning it. // Calls create search, and initializes the iterative search parts of the struct before returning it.
func (s *searches) newIterSearch(dest *crypto.NodeID, mask *crypto.NodeID, callback func(*sessionInfo, error)) *searchInfo { func (s *searches) newIterSearch(dest *crypto.NodeID, mask *crypto.NodeID, callback func(*sessionInfo, error)) *searchInfo {
sinfo := s.createSearch(dest, mask, callback) sinfo := s.createSearch(dest, mask, callback)
sinfo.visited = make(map[crypto.NodeID]bool) sinfo.visited = s.router.dht.nodeID
loc := s.router.core.switchTable.getLocator() loc := s.router.core.switchTable.getLocator()
sinfo.toVisit = append(sinfo.toVisit, &dhtInfo{ sinfo.toVisit = append(sinfo.toVisit, &dhtInfo{
key: s.router.core.boxPub, key: s.router.core.boxPub,