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

make Dial block until the search finishes, and use it as such

Browse source
This commit is contained in:
Arceliar 2019-06-28 18:42:31 -05:00
parent 29a0f8b572
commit 5df110ac79
5 changed files with 111 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/yggdrasil/search.go
View file

@ -141,7 +141,7 @@ func (sinfo *searchInfo) doSearchStep() {
if len(sinfo.toVisit) == 0 {
// Dead end, do cleanup
delete(sinfo.core.searches.searches, sinfo.dest)
go sinfo.callback(nil, errors.New("search reached dead end"))
sinfo.callback(nil, errors.New("search reached dead end"))
return
}
// Send to the next search target
@ -205,7 +205,7 @@ func (sinfo *searchInfo) checkDHTRes(res *dhtRes) bool {
sess = sinfo.core.sessions.createSession(&res.Key)
if sess == nil {
// nil if the DHT search finished but the session wasn't allowed
go sinfo.callback(nil, errors.New("session not allowed"))
sinfo.callback(nil, errors.New("session not allowed"))
return true
}
_, isIn := sinfo.core.sessions.getByTheirPerm(&res.Key)
@ -217,7 +217,7 @@ func (sinfo *searchInfo) checkDHTRes(res *dhtRes) bool {
sess.coords = res.Coords
sess.packet = sinfo.packet
sinfo.core.sessions.ping(sess)
go sinfo.callback(sess, nil)
sinfo.callback(sess, nil)
// Cleanup
delete(sinfo.core.searches.searches, res.Dest)
return true