diff --git a/src/dht.cpp b/src/dht.cpp index 8cadce08e111c4b6e677b708faa4b1f7bff47d75..2ebd09cc1ffe072f4350870842cf6f1cc2a3bb2e 100644 --- a/src/dht.cpp +++ b/src/dht.cpp @@ -341,8 +341,8 @@ Dht::searchSendGetValues(Sp<Search> sr, SearchNode* pn, bool update) if (not n) return nullptr; - DHT_LOG.w(sr->id, n->node->id, "[search %s] [node %s] sending 'find_node'", - sr->id.toString().c_str(), n->node->toString().c_str()); + /*DHT_LOG.d(sr->id, n->node->id, "[search %s] [node %s] sending 'find_node'", + sr->id.toString().c_str(), n->node->toString().c_str());*/ n->getStatus[query] = network_engine.sendFindNode(n->node, sr->id, -1, @@ -355,8 +355,8 @@ Dht::searchSendGetValues(Sp<Search> sr, SearchNode* pn, bool update) if (query and not query->select.getSelection().empty()) { /* The request contains a select. No need to paginate... */ - DHT_LOG.w(sr->id, n->node->id, "[search %s] [node %s] sending 'get'", - sr->id.toString().c_str(), n->node->toString().c_str()); + /*DHT_LOG.d(sr->id, n->node->id, "[search %s] [node %s] sending 'get'", + sr->id.toString().c_str(), n->node->toString().c_str());*/ n->getStatus[query] = network_engine.sendGetValues(n->node, sr->id, *query, @@ -1137,7 +1137,6 @@ Dht::cancelPut(const InfoHash& id, const Value::Id& vid) void Dht::storageChanged(const InfoHash& id, Storage& st, ValueStorage& v) { - DHT_LOG.d(id, "[store %s] changed", id.toString().c_str()); if (not st.local_listeners.empty()) { DHT_LOG.d(id, "[store %s] %lu local listeners", id.toString().c_str(), st.local_listeners.size()); std::vector<std::pair<GetCallback, std::vector<Sp<Value>>>> cbs; @@ -1157,20 +1156,22 @@ Dht::storageChanged(const InfoHash& id, Storage& st, ValueStorage& v) cb.first(cb.second); } - DHT_LOG.d(id, "[store %s] %lu remote listeners", id.toString().c_str(), st.listeners.size()); - for (const auto& node_listeners : st.listeners) { - for (const auto& l : node_listeners.second) { - auto f = l.second.query.where.getFilter(); - if (f and not f(*v.data)) - continue; - DHT_LOG.w(id, node_listeners.first->id, "[store %s] [node %s] sending update", - id.toString().c_str(), - node_listeners.first->toString().c_str()); - std::vector<Sp<Value>> vals {}; - vals.push_back(v.data); - Blob ntoken = makeToken(node_listeners.first->getAddr(), false); - network_engine.tellListener(node_listeners.first, l.first, id, 0, ntoken, {}, {}, - std::move(vals), l.second.query); + if (not st.listeners.empty()) { + DHT_LOG.d(id, "[store %s] %lu remote listeners", id.toString().c_str(), st.listeners.size()); + for (const auto& node_listeners : st.listeners) { + for (const auto& l : node_listeners.second) { + auto f = l.second.query.where.getFilter(); + if (f and not f(*v.data)) + continue; + DHT_LOG.w(id, node_listeners.first->id, "[store %s] [node %s] sending update", + id.toString().c_str(), + node_listeners.first->toString().c_str()); + std::vector<Sp<Value>> vals {}; + vals.push_back(v.data); + Blob ntoken = makeToken(node_listeners.first->getAddr(), false); + network_engine.tellListener(node_listeners.first, l.first, id, 0, ntoken, {}, {}, + std::move(vals), l.second.query); + } } } } @@ -2119,8 +2120,6 @@ Dht::onGetValues(Sp<Node> node, const InfoHash& hash, want_t, const Query& query if (st != store.end() && not st->second.empty()) { answer.values = st->second.get(query.where.getFilter()); DHT_LOG.d(hash, "[node %s] sending %u values", node->toString().c_str(), answer.values.size()); - } else { - DHT_LOG.d(hash, "[node %s] sending nodes", node->toString().c_str()); } return answer; } @@ -2135,14 +2134,13 @@ void Dht::onGetValuesDone(const Sp<Node>& node, return; } - DHT_LOG.d(sr->id, "[search %s] [node %s] got reply to 'get' with %u nodes", - sr->id.toString().c_str(), node->toString().c_str(), a.nodes4.size()+a.nodes6.size()); + /*DHT_LOG.d(sr->id, "[search %s] [node %s] got reply to 'get' with %u nodes", + sr->id.toString().c_str(), node->toString().c_str(), a.nodes4.size()+a.nodes6.size());*/ if (not a.ntoken.empty()) { if (not a.values.empty() or not a.fields.empty()) { - DHT_LOG.d(sr->id, "[search %s IPv%c] found %u values", - sr->id.toString().c_str(), sr->af == AF_INET ? '4' : '6', - a.values.size()); + DHT_LOG.d(sr->id, node->id, "[search %s] [node %s] found %u values", + sr->id.toString().c_str(), node->toString().c_str(), a.values.size()); for (auto& getp : sr->callbacks) { /* call all callbacks for this search */ auto& get = getp.second; if (not (get.get_cb or get.query_cb) or diff --git a/src/network_engine.cpp b/src/network_engine.cpp index 200b046dc6a14083bc27ad576982249d4d7662b6..c1ff5a12c27330d89630b2743a154f538380ed4b 100644 --- a/src/network_engine.cpp +++ b/src/network_engine.cpp @@ -498,7 +498,7 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro sendPong(from, msg->tid); break; case MessageType::FindNode: { - DHT_LOG.d(msg->target, node->id, "[node %s] got 'find' request for %s (%d)", node->toString().c_str(), msg->target.toString().c_str(), msg->want); + //DHT_LOG.d(msg->target, node->id, "[node %s] got 'find' request for %s (%d)", node->toString().c_str(), msg->target.toString().c_str(), msg->want); ++in_stats.find; RequestAnswer answer = onFindNode(node, msg->target, msg->want); auto nnodes = bufferNodes(from.getFamily(), msg->target, msg->want, answer.nodes4, answer.nodes6); @@ -506,7 +506,7 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro break; } case MessageType::GetValues: { - DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'get' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str()); + //DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'get' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str()); ++in_stats.get; RequestAnswer answer = onGetValues(node, msg->info_hash, msg->want, msg->query); auto nnodes = bufferNodes(from.getFamily(), msg->info_hash, msg->want, answer.nodes4, answer.nodes6);