From abd358f57d52d8c57bd8822fcff2d5f5f046dc6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20D=C3=A9saulniers?= Date: Tue, 15 Mar 2016 17:01:54 -0400 Subject: [PATCH] fix: 'get' requests responses without values... --- src/dht.cpp | 4 ++-- src/network_engine.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dht.cpp b/src/dht.cpp index 46dfec62..ac6dd9f0 100644 --- a/src/dht.cpp +++ b/src/dht.cpp @@ -2641,13 +2641,13 @@ Dht::onGetValues(std::shared_ptr node, InfoHash& hash, want_t) } }; if (st != store.end() && not st->empty()) { - DHT_LOG.DEBUG("[node %s %s] sending %u values.", - node->id.toString().c_str(), print_addr(node->ss, node->sslen).c_str(), st->valueCount()); auto values = st->getValues(); answer->values.resize(values.size()); std::transform(values.begin(), values.end(), answer->values.begin(), [](const ValueStorage& vs) { return vs.data; }); + DHT_LOG.DEBUG("[node %s %s] sending %u values.", + node->id.toString().c_str(), print_addr(node->ss, node->sslen).c_str(), answer->values.size()); } else { DHT_LOG.DEBUG("[node %s %s] sending nodes.", node->id.toString().c_str(), print_addr(node->ss, node->sslen).c_str()); diff --git a/src/network_engine.cpp b/src/network_engine.cpp index fe510a04..fcb67550 100644 --- a/src/network_engine.cpp +++ b/src/network_engine.cpp @@ -480,7 +480,7 @@ NetworkEngine::sendNodesValues(const sockaddr* sa, socklen_t salen, TransId tid, unsigned k = 0; do { - subset.emplace_back(packMsg(st[j]->data)); + subset.emplace_back(packMsg(st[j])); total_size += subset.back().size(); ++k; j = (j + 1) % st.size();