external/ton
1
0
Fork 0
mirror of https://github.com/ton-blockchain/ton synced 2025-03-09 15:40:10 +00:00
Code Issues Releases Wiki Activity

Revert "Process adnl query errors"

Browse source 
This reverts commit 1869a25062.
This commit is contained in:
SpyCheese 2024-03-15 14:13:07 +03:00
parent e216651112
commit fc6e2ead29
10 changed files with 1 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

22
rldp/rldp.cpp
View file

@ -87,13 +87,6 @@ void RldpIn::answer_query(adnl::AdnlNodeIdShort src, adnl::AdnlNodeIdShort dst,
transfer(src, dst, timeout, std::move(B), transfer_id);
}
void RldpIn::reject_query(adnl::AdnlNodeIdShort src, adnl::AdnlNodeIdShort dst, td::Timestamp timeout,
adnl::AdnlQueryId query_id, TransferId transfer_id) {
auto B = serialize_tl_object(create_tl_object<ton_api::rldp_queryError>(query_id), true);
transfer(src, dst, timeout, std::move(B), transfer_id);
}
void RldpIn::alarm_query(adnl::AdnlQueryId query_id, TransferId transfer_id) {
queries_.erase(query_id);
max_size_.erase(transfer_id);
@ -206,16 +199,12 @@ void RldpIn::process_message(adnl::AdnlNodeIdShort source, adnl::AdnlNodeIdShort
auto data = R.move_as_ok();
if (data.size() > max_answer_size) {
VLOG(RLDP_NOTICE) << "rldp query failed: answer too big";
td::actor::send_closure(SelfId, &RldpIn::reject_query, local_id, source, timeout, query_id,
transfer_id ^ TransferId::ones());
} else {
td::actor::send_closure(SelfId, &RldpIn::answer_query, local_id, source, timeout, query_id,
transfer_id ^ TransferId::ones(), std::move(data));
}
} else {
VLOG(RLDP_NOTICE) << "rldp query failed: " << R.move_as_error();
td::actor::send_closure(SelfId, &RldpIn::reject_query, local_id, source, timeout, query_id,
transfer_id ^ TransferId::ones());
}
});
VLOG(RLDP_DEBUG) << "delivering rldp query";
@ -234,17 +223,6 @@ void RldpIn::process_message(adnl::AdnlNodeIdShort source, adnl::AdnlNodeIdShort
}
}
void RldpIn::process_message(adnl::AdnlNodeIdShort source, adnl::AdnlNodeIdShort local_id, TransferId transfer_id,
ton_api::rldp_queryError &message) {
auto it = queries_.find(message.query_id_);
if (it != queries_.end()) {
td::actor::send_closure(it->second, &adnl::AdnlQuery::set_error, td::Status::Error("adnl query rejected"));
queries_.erase(it);
} else {
VLOG(RLDP_INFO) << "received reject to unknown query " << message.query_id_;
}
}
void RldpIn::transfer_completed(TransferId transfer_id) {
senders_.erase(transfer_id);
VLOG(RLDP_DEBUG) << "rldp: completed transfer " << transfer_id << "; " << senders_.size() << " out transfer pending ";