andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Better MTProto spelling.

Browse Source 
GitOrigin-RevId: d631aa03c2b3b19abe2c804d9a5e1d7d95602693
This commit is contained in:
levlam 2019-10-26 16:58:38 +03:00
parent 6714476496
commit 809b28aa4a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
td/mtproto/RawConnection.cpp
View File

@ -39,7 +39,7 @@ void RawConnection::send_crypto(const Storer &storer, int64 session_id, int64 sa
if (tmp.second) { if (tmp.second) {
use_quick_ack = true; use_quick_ack = true;
} else { } else {
LOG(ERROR) << "Quick ack collision " << tag("quick_ack", info.message_ack); LOG(ERROR) << "Quick ack " << info.message_ack << " collision";
} }
} }
@ -130,20 +130,20 @@ Status RawConnection::on_read_mtproto_error(int32 error_code) {
if (stats_callback_) { if (stats_callback_) {
stats_callback_->on_mtproto_error(); stats_callback_->on_mtproto_error();
} }
return Status::Error(500, PSLICE() << "Mtproto error: " << error_code); return Status::Error(500, PSLICE() << "MTProto error: " << error_code);
} }
if (error_code == -404) { if (error_code == -404) {
return Status::Error(-404, PSLICE() << "Mtproto error: " << error_code); return Status::Error(-404, PSLICE() << "MTProto error: " << error_code);
} }
return Status::Error(PSLICE() << "Mtproto error: " << error_code); return Status::Error(PSLICE() << "MTProto error: " << error_code);
} }
Status RawConnection::on_quick_ack(uint32 quick_ack, Callback &callback) { Status RawConnection::on_quick_ack(uint32 quick_ack, Callback &callback) {
auto it = quick_ack_to_token_.find(quick_ack); auto it = quick_ack_to_token_.find(quick_ack);
if (it == quick_ack_to_token_.end()) { if (it == quick_ack_to_token_.end()) {
LOG(WARNING) << Status::Error(PSLICE() << "Unknown " << tag("quick_ack", quick_ack)); LOG(WARNING) << Status::Error(PSLICE() << "Unknown quick_ack " << quick_ack);
return Status::OK(); return Status::OK();
// TODO: return Status::Error(PSLICE() << "Unknown " << tag("quick_ack", quick_ack)); // TODO: return Status::Error(PSLICE() << "Unknown quick_ack " << quick_ack);
} }
auto token = it->second; auto token = it->second;
quick_ack_to_token_.erase(it); quick_ack_to_token_.erase(it);

2
td/telegram/SecretChatActor.cpp
View File

@ -910,7 +910,7 @@ Status SecretChatActor::do_inbound_message_encrypted(unique_ptr<logevent::Inboun
send_update_secret_chat(); send_update_secret_chat();
} }
if (layer >= MTPROTO_2_LAYER && mtproto_version < 2) { if (layer >= MTPROTO_2_LAYER && mtproto_version < 2) {
return Status::Error(PSLICE() << "Mtproto 1.0 encryption is forbidden for this layer"); return Status::Error(PSLICE() << "MTProto 1.0 encryption is forbidden for this layer");
} }
if (message_with_layer->in_seq_no_ < 0) { if (message_with_layer->in_seq_no_ < 0) {
return Status::Error(PSLICE() << "Invalid seq_no: " << to_string(message_with_layer)); return Status::Error(PSLICE() << "Invalid seq_no: " << to_string(message_with_layer));

2
td/telegram/net/ConnectionCreator.cpp
View File

@ -692,7 +692,7 @@ Result<SocketFd> ConnectionCreator::find_connection(const Proxy &proxy, const IP
<< (info.use_http ? " over HTTP" : ""); << (info.use_http ? " over HTTP" : "");
if (proxy.use_mtproto_proxy()) { if (proxy.use_mtproto_proxy()) {
extra.debug_str = PSTRING() << "Mtproto " << proxy_ip_address << extra.debug_str; extra.debug_str = PSTRING() << "MTProto " << proxy_ip_address << extra.debug_str;
LOG(INFO) << "Create: " << extra.debug_str; LOG(INFO) << "Create: " << extra.debug_str;
return SocketFd::open(proxy_ip_address); return SocketFd::open(proxy_ip_address);