tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use local variable for wakeup_at.

Browse Source
This commit is contained in:
levlam 2023-04-20 17:24:30 +03:00
parent 0c638d3531
commit 78c41b9fef
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
td/mtproto/SessionConnection.cpp
View File

@ -1079,7 +1079,6 @@ Status SessionConnection::do_flush() {
double SessionConnection::flush(SessionConnection::Callback *callback) {
callback_ = callback;
wakeup_at_ = 0;
auto status = do_flush();
// check error
if (status.is_error()) {
@ -1088,23 +1087,23 @@ double SessionConnection::flush(SessionConnection::Callback *callback) {
return 0;
}
// wakeup_at
double wakeup_at = 0;
// three independent timeouts
// 1. close connection after ping_disconnect_delay() after last pong
// 2. close connection after read_disconnect_delay() after last read
// 3. the one returned by must_flush_packet
relax_timeout_at(&wakeup_at_, last_pong_at_ + ping_disconnect_delay() + 0.002);
relax_timeout_at(&wakeup_at_, last_read_at_ + read_disconnect_delay() + 0.002);
relax_timeout_at(&wakeup_at_, flush_packet_at_);
relax_timeout_at(&wakeup_at, last_pong_at_ + ping_disconnect_delay() + 0.002);
relax_timeout_at(&wakeup_at, last_read_at_ + read_disconnect_delay() + 0.002);
relax_timeout_at(&wakeup_at, flush_packet_at_);
auto now = Time::now();
LOG(DEBUG) << "Last pong was in " << (now - last_pong_at_) << '/' << (now - real_last_pong_at_)
<< ", last read was in " << (now - last_read_at_) << '/' << (now - real_last_read_at_)
<< ", RTT = " << rtt() << ", ping timeout = " << ping_disconnect_delay()
<< ", read timeout = " << read_disconnect_delay() << ", flush packet in " << (flush_packet_at_ - now)
<< ", wakeup in " << (wakeup_at_ - now);
<< ", wakeup in " << (wakeup_at - now);
return wakeup_at_;
return wakeup_at;
}
void SessionConnection::force_close(SessionConnection::Callback *callback) {

1
td/mtproto/SessionConnection.h
View File

@ -197,7 +197,6 @@ class SessionConnection final
bool need_destroy_auth_key_ = false;
bool sent_destroy_auth_key_ = false;
double wakeup_at_ = 0;
double flush_packet_at_ = 0;
double last_get_future_salt_at_ = 0;