Skip to content
Snippets Groups Projects
Commit ae91f8bd authored by Adrien Béraud's avatar Adrien Béraud
Browse files

dhtrunner: default-initialize tokens

parent 28eeee24
No related branches found
No related tags found
No related merge requests found
...@@ -33,10 +33,10 @@ constexpr std::chrono::seconds DhtRunner::BOOTSTRAP_PERIOD; ...@@ -33,10 +33,10 @@ constexpr std::chrono::seconds DhtRunner::BOOTSTRAP_PERIOD;
static constexpr size_t RX_QUEUE_MAX_SIZE = 1024 * 16; static constexpr size_t RX_QUEUE_MAX_SIZE = 1024 * 16;
struct DhtRunner::Listener { struct DhtRunner::Listener {
size_t tokenClassicDht; size_t tokenClassicDht {0};
size_t tokenProxyDht; size_t tokenProxyDht {0};
ValueCallback gcb; ValueCallback gcb;
InfoHash hash; InfoHash hash {};
Value::Filter f; Value::Filter f;
Where w; Where w;
}; };
...@@ -661,7 +661,7 @@ DhtRunner::listen(InfoHash hash, ValueCallback vcb, Value::Filter f, Where w) ...@@ -661,7 +661,7 @@ DhtRunner::listen(InfoHash hash, ValueCallback vcb, Value::Filter f, Where w)
pending_ops.emplace([=](SecureDht& dht) mutable { pending_ops.emplace([=](SecureDht& dht) mutable {
#ifdef OPENDHT_PROXY_CLIENT #ifdef OPENDHT_PROXY_CLIENT
auto tokenbGlobal = listener_token_++; auto tokenbGlobal = listener_token_++;
Listener listener {}; auto& listener = listeners_[tokenbGlobal];
listener.hash = hash; listener.hash = hash;
listener.f = std::move(f); listener.f = std::move(f);
listener.w = std::move(w); listener.w = std::move(w);
...@@ -676,7 +676,6 @@ DhtRunner::listen(InfoHash hash, ValueCallback vcb, Value::Filter f, Where w) ...@@ -676,7 +676,6 @@ DhtRunner::listen(InfoHash hash, ValueCallback vcb, Value::Filter f, Where w)
listener.tokenProxyDht = dht.listen(hash, listener.gcb, listener.f, listener.w); listener.tokenProxyDht = dht.listen(hash, listener.gcb, listener.f, listener.w);
else else
listener.tokenClassicDht = dht.listen(hash, listener.gcb, listener.f, listener.w); listener.tokenClassicDht = dht.listen(hash, listener.gcb, listener.f, listener.w);
listeners_.emplace(tokenbGlobal, std::move(listener));
ret_token->set_value(tokenbGlobal); ret_token->set_value(tokenbGlobal);
#else #else
ret_token->set_value(dht.listen(hash, std::move(vcb), std::move(f), std::move(w))); ret_token->set_value(dht.listen(hash, std::move(vcb), std::move(f), std::move(w)));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment