From af8bfdc1c1cd97415867a46bf80d4e0036a414fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20D=C3=A9saulniers?= <sim.desaulniers@gmail.com>
Date: Wed, 3 Aug 2016 16:39:34 -0400
Subject: [PATCH] dht: fix sendListen loop bug
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.
---
src/dht.cpp | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/dht.cpp b/src/dht.cpp
index 9796fbe8..2d791634 100644
--- a/src/dht.cpp
+++ b/src/dht.cpp
@@ -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);
--
GitLab