diff --git a/src/sha1_ngcft1.cpp b/src/sha1_ngcft1.cpp index 5b43823..7bc1a72 100644 --- a/src/sha1_ngcft1.cpp +++ b/src/sha1_ngcft1.cpp @@ -170,7 +170,7 @@ void SHA1_NGCFT1::iterate(float delta) { // if we have not heard for 10sec, timeout if (it->second.time_since_activity >= 10.f) { //std::cerr << "SHA1_NGCFT1 warning: sending chunk tansfer timed out " << std::get<0>(*it) << ":" << std::get<1>(*it) << "." << int(std::get<2>(*it)) << "\n"; - std::cerr << "SHA1_NGCFT1 warning: sending chunk tansfer timed out " << "." << int(it->first) << "\n"; + std::cerr << "SHA1_NGCFT1 warning: sending tansfer timed out " << "." << int(it->first) << "\n"; it = peer_it->second.erase(it); } else { it++; @@ -740,6 +740,14 @@ bool SHA1_NGCFT1::sendFilePath(const Contact3 c, std::string_view file_name, std ce.emplace(0u); } + // we dont want the info anymore + ce.remove(); + if (auto it = std::find(_queue_content_want_info.begin(), _queue_content_want_info.end(), ce); it != _queue_content_want_info.end()) { + _queue_content_want_info.erase(it); + } + + // TODO: we dont want chunks anymore + // TODO: make sure to abort every receiving transfer (sending info and chunk should be fine, info uses copy and chunk handle) } else { ce = {_contentr, _contentr.create()};