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

Fix size estimation in send_message_in (#637)

Browse source
This commit is contained in:
SpyCheese 2023-03-06 15:29:23 +00:00 • committed by GitHub
parent a00744730e
commit 4db7ad039a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
adnl/adnl-peer.cpp
View file

@ -70,7 +70,7 @@ void AdnlPeerPairImpl::alarm() {
retry_send_at_ = td::Timestamp::never(); retry_send_at_ = td::Timestamp::never();
auto messages = std::move(pending_messages_); auto messages = std::move(pending_messages_);
pending_messages_.clear(); pending_messages_.clear();
send_messages_in(std::move(messages), true); send_messages_in(std::move(messages), false);
} }
alarm_timestamp().relax(next_dht_query_at_); alarm_timestamp().relax(next_dht_query_at_);
alarm_timestamp().relax(next_db_update_at_); alarm_timestamp().relax(next_db_update_at_);
@ -267,7 +267,9 @@ void AdnlPeerPairImpl::send_messages_in(std::vector<OutboundAdnlMessage> message
size_t ptr = 0; size_t ptr = 0;
bool first = true; bool first = true;
do { do {
size_t s = (channel_ready_ ? channel_packet_header_max_size() : packet_header_max_size()); bool try_reinit = try_reinit_at_ && try_reinit_at_.is_in_past();
bool via_channel = channel_ready_ && !try_reinit;
size_t s = (via_channel ? channel_packet_header_max_size() : packet_header_max_size());
if (first) { if (first) {
s += 2 * addr_list_max_size(); s += 2 * addr_list_max_size();
} }
@ -311,8 +313,6 @@ void AdnlPeerPairImpl::send_messages_in(std::vector<OutboundAdnlMessage> message
} }
} }
bool try_reinit = try_reinit_at_ && try_reinit_at_.is_in_past();
bool via_channel = channel_ready_ && !try_reinit;
if (!via_channel) { if (!via_channel) {
packet.set_reinit_date(Adnl::adnl_start_time(), reinit_date_); packet.set_reinit_date(Adnl::adnl_start_time(), reinit_date_);
packet.set_source(local_id_); packet.set_source(local_id_);