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

make sure searches don't end if try to continue (in parallel) with nowhere left to send, but we just sent a search and are still waiting for a response

Browse source
This commit is contained in:
Arceliar 2019-08-11 13:11:14 -05:00
parent 7a28eb787e
commit 277da1fe60
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/yggdrasil/search.go
View file

@ -36,6 +36,7 @@ type searchInfo struct {
core *Core core *Core
dest crypto.NodeID dest crypto.NodeID
mask crypto.NodeID mask crypto.NodeID
time time.Time
toVisit []*dhtInfo toVisit []*dhtInfo
visited map[crypto.NodeID]bool visited map[crypto.NodeID]bool
callback func(*sessionInfo, error) callback func(*sessionInfo, error)
@ -68,6 +69,7 @@ func (s *searches) createSearch(dest *crypto.NodeID, mask *crypto.NodeID, callba
core: s.core, core: s.core,
dest: *dest, dest: *dest,
mask: *mask, mask: *mask,
time: time.Now(),
callback: callback, callback: callback,
} }
s.searches[*dest] = &info s.searches[*dest] = &info
@ -130,9 +132,11 @@ func (sinfo *searchInfo) addToSearch(res *dhtRes) {
// Otherwise, it pops the closest node to the destination (in keyspace) off of the toVisit list and sends a dht ping. // Otherwise, it pops the closest node to the destination (in keyspace) off of the toVisit list and sends a dht ping.
func (sinfo *searchInfo) doSearchStep() { func (sinfo *searchInfo) doSearchStep() {
if len(sinfo.toVisit) == 0 { if len(sinfo.toVisit) == 0 {
// Dead end, do cleanup if time.Since(sinfo.time) > search_RETRY_TIME {
delete(sinfo.core.searches.searches, sinfo.dest) // Dead end and no response in too long, do cleanup
sinfo.callback(nil, errors.New("search reached dead end")) delete(sinfo.core.searches.searches, sinfo.dest)
sinfo.callback(nil, errors.New("search reached dead end"))
}
return return
} }
// Send to the next search target // Send to the next search target
@ -141,6 +145,7 @@ func (sinfo *searchInfo) doSearchStep() {
rq := dhtReqKey{next.key, sinfo.dest} rq := dhtReqKey{next.key, sinfo.dest}
sinfo.core.dht.addCallback(&rq, sinfo.handleDHTRes) sinfo.core.dht.addCallback(&rq, sinfo.handleDHTRes)
sinfo.core.dht.ping(next, &sinfo.dest) sinfo.core.dht.ping(next, &sinfo.dest)
sinfo.time = time.Now()
} }
// If we've recenty sent a ping for this search, do nothing. // If we've recenty sent a ping for this search, do nothing.