mirrors/opendht
1
0 Fork 0
mirror of https://github.com/savoirfairelinux/opendht.git synced 2026-11-08 12:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix listen was not handled...

Browse Source
This commit is contained in:
Simon Désaulniers authored and Adrien Béraud committed 2016-05-02 15:25:15 -04:00
1 parent abd358f57d
commit 674f25fcae
3 files changed
+31 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/network_engine.cpp
+22 -18
View File
@@ -128,13 +128,10 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, const sockaddr
uint16_t ttid = 0;
if (msg.type == MessageType::Error or msg.type == MessageType::Reply) {
Request* req = nullptr;
const auto& reqp = requests.find(msg.tid[2]);
if (reqp != requests.end())
req = &(*reqp->second);
if (not req)
auto reqp = requests.find(msg.tid.getTid());
if (reqp == requests.end())
throw DhtProtocolException {DhtProtocolException::UNKNOWN_TID, "Can't find transaction", msg.id};
auto req = reqp->second;
auto node = onNewNode(msg.id, from, fromlen, 2);
onReportedAddr(msg.id, (sockaddr*)&msg.addr.first, msg.addr.second);
@@ -155,9 +152,10 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, const sockaddr
break;
}
case MessageType::Reply:
req->status->reply_time = scheduler.time();
req->on_done(req->status, std::move(msg));
requests.erase(reqp);
req->status->reply_time = scheduler.time();
req->status->completed = true;
req->on_done(req->status, std::move(msg));
break;
default:
break;
@@ -212,7 +210,7 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, const sockaddr
break;
}
++in_stats.listen;
RequestAnswer answer = onListen(node, msg.info_hash, msg.token, msg.tid[2]);
RequestAnswer answer = onListen(node, msg.info_hash, msg.token, msg.tid.getTid());
sendListenConfirmation(from, fromlen, msg.tid);
break;
}
@@ -281,7 +279,7 @@ NetworkEngine::sendPing(const sockaddr* sa, socklen_t salen, RequestCb on_done,
pk.pack(std::string("v")); pk.pack(my_v);
Blob b {buffer.data(), buffer.data() + buffer.size()};
Request req {tid[2], std::make_shared<Node>(InfoHash {}, sa, salen), std::move(b),
Request req {tid.getTid(), std::make_shared<Node>(InfoHash {}, sa, salen), std::move(b),
[=](std::shared_ptr<RequestStatus> req_status, ParsedMessage&&){
if (on_done) {
on_done(req_status, {});
@@ -343,7 +341,7 @@ NetworkEngine::sendFindNode(std::shared_ptr<Node> n, const InfoHash& target, wan
Blob b {buffer.data(), buffer.data() + buffer.size()};
Request req {tid[2], n, std::move(b),
Request req {tid.getTid(), n, std::move(b),
[=](std::shared_ptr<RequestStatus> req_status, ParsedMessage&& msg) { /* on done */
if (on_done) {
on_done(req_status, deserializeNodesValues(msg));
@@ -387,7 +385,7 @@ NetworkEngine::sendGetValues(std::shared_ptr<Node> n, const InfoHash& info_hash,
pk.pack(std::string("v")); pk.pack(my_v);
Blob b {buffer.data(), buffer.data() + buffer.size()};
Request req {tid[2], n, std::move(b),
Request req {tid.getTid(), n, std::move(b),
[=](std::shared_ptr<RequestStatus> req_status, ParsedMessage&& msg) { /* on done */
if (on_done) {
on_done(req_status, deserializeNodesValues(msg));
@@ -597,16 +595,22 @@ NetworkEngine::sendListen(std::shared_ptr<Node> n, const InfoHash& infohash, con
Blob b {buffer.data(), buffer.data() + buffer.size()};
Request req {tid[2], n, std::move(b),
Request req {tid.getTid(), n, std::move(b),
[=](std::shared_ptr<RequestStatus> req_status, ParsedMessage&&) { /* on done */
if (on_done) {
requests.emplace(tid.getTid(), std::make_shared<Request>(
tid.getTid(), req_status->node, Blob {},
[=](std::shared_ptr<RequestStatus> req_status, ParsedMessage&& msg){
DHT_LOG.DEBUG("[listen %s] got new values", infohash.toString().c_str());
if (on_done)
on_done(req_status, deserializeNodesValues(msg));
}, nullptr
));
if (on_done)
on_done(req_status, {});
}
},
[=](std::shared_ptr<RequestStatus> req_status, bool) { /* on expired */
if (on_expired) {
if (on_expired)
on_expired(req_status, {});
}
}
};
auto req_status = req.status;
@@ -658,7 +662,7 @@ NetworkEngine::sendAnnounceValue(std::shared_ptr<Node> n, const InfoHash& infoha
pk.pack(std::string("v")); pk.pack(my_v);
Blob b {buffer.data(), buffer.data() + buffer.size()};
Request req {tid[2], n, std::move(b),
Request req {tid.getTid(), n, std::move(b),
[=](std::shared_ptr<RequestStatus> req_status, ParsedMessage&& msg) { /* on done */
if (msg.value_id == Value::INVALID_ID) {
DHT_LOG.DEBUG("Unknown search or announce!");