mirrors/opendht
1
0 Fork 0
mirror of https://github.com/savoirfairelinux/opendht.git synced 2026-11-08 12:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

dht: fix sendListen loop bug

Browse Source 
Each time a 'listen' request is sent to the network engine, we track this
request in the upper layer with a map<shared_ptr<Query>, shared_ptr<Request>>.
At some point, this map has to be maintained or totally cleared. However, it was
done wrong, hence the sendListen loop. Clearing a pair <Query, Request> has to
be done when the API user cancels a 'listen' operation.
This commit is contained in:
Simon Désaulniers committed 2016-08-03 18:49:37 -04:00
1 parent 88040ad467
commit af8bfdc1c1
1 file changed
+10 -9
Download Patch File Download Diff File Expand all files Collapse all files
src/dht.cpp
+10 -9
View File
@@ -903,8 +903,6 @@ Dht::searchStep(std::shared_ptr<Search> sr)
if (auto sr = ws.lock()) {
onListenDone(req, answer, sr, query);
searchStep(sr);
if (auto sn = sr->getNode(req.node))
sn->listenStatus.erase(query);
}
},
[this,ws,last_req,query](const Request& req, bool over) mutable
@@ -1502,16 +1500,19 @@ Dht::cancelListen(const InfoHash& id, size_t token)
auto af_token = s->af == AF_INET ? std::get<1>(it->second) : std::get<2>(it->second);
if (af_token == 0)
continue;
s->listeners.erase(af_token);
if (s->listeners.empty()) {
for (auto& sn : s->nodes) {
/* also erase requests for all searchnodes. */
for (auto& ls : sn.listenStatus) {
std::shared_ptr<Query> query;
const auto& ll = s->listeners.find(af_token);
if (ll != s->listeners.cend())
query = ll->second.query;
for (auto& sn : s->nodes) {
if (s->listeners.empty()) { /* also erase requests for all searchnodes. */
for (auto& ls : sn.listenStatus)
network_engine.cancelRequest(ls.second);
}
sn.listenStatus.clear();
}
} else if (query)
sn.listenStatus.erase(query);
}
s->listeners.erase(af_token);
}
};
searches_cancel_listen(searches4);