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

better search cleanup, but needs more testing to make sure it really works

Browse source
This commit is contained in:
Arceliar 2020-02-08 20:26:37 -06:00
parent d0e6846173
commit 8e05c6c6a7
2 changed files with 31 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/yggdrasil/conn.go
View file

@ -130,8 +130,8 @@ func (c *Conn) search() error {
close(done)
}
}
sinfo, infos := c.core.router.searches.newIterSearch(c.nodeID, c.nodeMask, searchCompleted)
sinfo.continueSearch(infos)
sinfo := c.core.router.searches.newIterSearch(c.nodeID, c.nodeMask, searchCompleted)
sinfo.startSearch()
} else {
err = errors.New("search already exists")
close(done)
@ -152,11 +152,10 @@ func (c *Conn) doSearch() {
if !isIn {
// Nothing was found, so create a new search
searchCompleted := func(sinfo *sessionInfo, e error) {}
var infos []*dhtInfo
sinfo, infos = c.core.router.searches.newIterSearch(c.nodeID, c.nodeMask, searchCompleted)
sinfo = c.core.router.searches.newIterSearch(c.nodeID, c.nodeMask, searchCompleted)
c.core.log.Debugf("%s DHT search started: %p", c.String(), sinfo)
// Start the search
sinfo.continueSearch(infos)
sinfo.startSearch()
}
}
c.core.router.Act(c.session, routerWork)