From 88e0342e02cac27b4994f0093df604377a55b4ac Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 5 Nov 2019 13:23:09 +0300 Subject: [PATCH] Update to the latest submodules. --- .../SourceFiles/boxes/sticker_set_box.cpp | 2 +- .../chat_helpers/field_autocomplete.cpp | 2 +- .../chat_helpers/stickers_list_widget.cpp | 2 +- .../SourceFiles/core/base_integration.cpp | 6 ++ Telegram/SourceFiles/core/base_integration.h | 1 + Telegram/SourceFiles/mtproto/connection.cpp | 20 ++-- .../SourceFiles/mtproto/connection_abstract.h | 2 +- Telegram/SourceFiles/mtproto/core_types.cpp | 91 +++---------------- Telegram/SourceFiles/mtproto/core_types.h | 74 ++++++++++++++- Telegram/codegen | 2 +- Telegram/gyp/Telegram.gyp | 4 +- Telegram/gyp/generate.py | 2 +- Telegram/gyp/helpers | 2 +- Telegram/gyp/lib_export.gyp | 1 - Telegram/gyp/lib_ffmpeg.gyp | 4 +- Telegram/gyp/lib_lz4.gyp | 1 - Telegram/lib_base | 2 +- Telegram/lib_crl | 2 +- Telegram/lib_lottie | 2 +- Telegram/lib_tl | 2 +- 20 files changed, 116 insertions(+), 108 deletions(-) diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp index 6b173b70c..597d71826 100644 --- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp +++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp @@ -630,7 +630,7 @@ void StickerSetBox::Inner::paintSticker( auto h = 1; if (element.animated && !document->dimensions.isEmpty()) { const auto request = Lottie::FrameRequest{ boundingBoxSize() * cIntRetinaFactor() }; - const auto size = request.size(document->dimensions) / cIntRetinaFactor(); + const auto size = request.size(document->dimensions, true) / cIntRetinaFactor(); w = std::max(size.width(), 1); h = std::max(size.height(), 1); } else { diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp index 0e012190d..07f6ba953 100644 --- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp +++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp @@ -651,7 +651,7 @@ void FieldAutocompleteInner::paintEvent(QPaintEvent *e) { auto h = 1; if (sticker.animated && !document->dimensions.isEmpty()) { const auto request = Lottie::FrameRequest{ stickerBoundingBox() * cIntRetinaFactor() }; - const auto size = request.size(document->dimensions) / cIntRetinaFactor(); + const auto size = request.size(document->dimensions, true) / cIntRetinaFactor(); w = std::max(size.width(), 1); h = std::max(size.height(), 1); } else { diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp index 908cb45a2..e3cb75407 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp @@ -1677,7 +1677,7 @@ void StickersListWidget::paintSticker(Painter &p, Set &set, int y, int section, auto h = 1; if (sticker.animated && !document->dimensions.isEmpty()) { const auto request = Lottie::FrameRequest{ boundingBoxSize() * cIntRetinaFactor() }; - const auto size = request.size(document->dimensions) / cIntRetinaFactor(); + const auto size = request.size(document->dimensions, true) / cIntRetinaFactor(); w = std::max(size.width(), 1); h = std::max(size.height(), 1); } else { diff --git a/Telegram/SourceFiles/core/base_integration.cpp b/Telegram/SourceFiles/core/base_integration.cpp index d6cf7cb8d..5228b988a 100644 --- a/Telegram/SourceFiles/core/base_integration.cpp +++ b/Telegram/SourceFiles/core/base_integration.cpp @@ -21,6 +21,12 @@ void BaseIntegration::enterFromEventLoop(FnMut &&method) { std::move(method)); } +void BaseIntegration::logMessage(const QString &message) { +#ifdef DEBUG_LOG + DEBUG_LOG((message)); +#endif // DEBUG_LOG +} + void BaseIntegration::logAssertionViolation(const QString &info) { #ifdef LOG LOG(("Assertion Failed! ") + info); diff --git a/Telegram/SourceFiles/core/base_integration.h b/Telegram/SourceFiles/core/base_integration.h index 5d7221b8d..11652830e 100644 --- a/Telegram/SourceFiles/core/base_integration.h +++ b/Telegram/SourceFiles/core/base_integration.h @@ -16,6 +16,7 @@ public: BaseIntegration(int argc, char *argv[]); void enterFromEventLoop(FnMut &&method) override; + void logMessage(const QString &message) override; void logAssertionViolation(const QString &info) override; }; diff --git a/Telegram/SourceFiles/mtproto/connection.cpp b/Telegram/SourceFiles/mtproto/connection.cpp index a5a7cdd33..90b8d2056 100644 --- a/Telegram/SourceFiles/mtproto/connection.cpp +++ b/Telegram/SourceFiles/mtproto/connection.cpp @@ -225,7 +225,7 @@ ModExpFirst CreateModExp( void wrapInvokeAfter(SecureRequest &to, const SecureRequest &from, const RequestMap &haveSent, int32 skipBeforeRequest = 0) { const auto afterId = *(mtpMsgId*)(from->after->data() + 4); const auto i = afterId ? haveSent.constFind(afterId) : haveSent.cend(); - int32 size = to->size(), lenInInts = (from.innerLength() >> 2), headlen = 4, fulllen = headlen + lenInInts; + int32 size = to->size(), lenInInts = (tl::count_length(from) >> 2), headlen = 4, fulllen = headlen + lenInInts; if (i == haveSent.constEnd()) { // no invoke after or such msg was not sent or was completed recently to->resize(size + fulllen + skipBeforeRequest); if (skipBeforeRequest) { @@ -882,7 +882,7 @@ void ConnectionPrivate::tryToSend() { MTP_string(cloudLangCode), clientProxyFields, SecureRequest()); - initSizeInInts = (initWrapper.innerLength() >> 2) + 2; + initSizeInInts = (tl::count_length(initWrapper) >> 2) + 2; initSize = initSizeInInts * sizeof(mtpPrime); } @@ -932,7 +932,7 @@ void ConnectionPrivate::tryToSend() { if (needsLayer && !toSendRequest->needsLayer) needsLayer = false; if (toSendRequest->after) { - const auto toSendSize = toSendRequest.innerLength() >> 2; + const auto toSendSize = tl::count_length(toSendRequest) >> 2; auto wrappedRequest = SecureRequest::Prepare( toSendSize, toSendSize + 3); @@ -942,13 +942,13 @@ void ConnectionPrivate::tryToSend() { toSendRequest = std::move(wrappedRequest); } if (needsLayer) { - const auto noWrapSize = (toSendRequest.innerLength() >> 2); + const auto noWrapSize = (tl::count_length(toSendRequest) >> 2); const auto toSendSize = noWrapSize + initSizeInInts; auto wrappedRequest = SecureRequest::Prepare(toSendSize); memcpy(wrappedRequest->data(), toSendRequest->constData(), 7 * sizeof(mtpPrime)); // all except length wrappedRequest->push_back(mtpc_invokeWithLayer); wrappedRequest->push_back(internal::CurrentLayer); - initWrapper.write(*wrappedRequest); + initWrapper.write(*wrappedRequest); wrappedRequest->resize(wrappedRequest->size() + noWrapSize); memcpy(wrappedRequest->data() + wrappedRequest->size() - noWrapSize, toSendRequest->constData() + 8, noWrapSize * sizeof(mtpPrime)); toSendRequest = std::move(wrappedRequest); @@ -980,7 +980,7 @@ void ConnectionPrivate::tryToSend() { initSerialized.reserve(initSizeInInts); initSerialized.push_back(mtpc_invokeWithLayer); initSerialized.push_back(internal::CurrentLayer); - initWrapper.write(initSerialized); + initWrapper.write(initSerialized); } // prepare container + each in invoke after toSendRequest = SecureRequest::Prepare( @@ -1038,7 +1038,7 @@ void ConnectionPrivate::tryToSend() { toSendRequest->resize(reqNeedsLayer + initSizeInInts + req.messageSize()); memcpy(toSendRequest->data() + reqNeedsLayer, req->constData() + 4, 4 * sizeof(mtpPrime)); memcpy(toSendRequest->data() + reqNeedsLayer + 4, initSerialized.constData(), initSize); - memcpy(toSendRequest->data() + reqNeedsLayer + 4 + initSizeInInts, req->constData() + 8, req.innerLength()); + memcpy(toSendRequest->data() + reqNeedsLayer + 4 + initSizeInInts, req->constData() + 8, tl::count_length(req)); *(toSendRequest->data() + reqNeedsLayer + 3) += initSize; added = true; } @@ -2701,7 +2701,7 @@ void ConnectionPrivate::pqAnswered() { bytes::vector ConnectionPrivate::encryptPQInnerRSA( const MTPP_Q_inner_data &data, const internal::RSAPublicKey &key) { - auto p_q_inner_size = data.innerLength(); + auto p_q_inner_size = tl::count_length(data); auto encSize = (p_q_inner_size >> 2) + 6; if (encSize >= 65) { auto tmp = mtpBuffer(); @@ -2760,7 +2760,7 @@ void ConnectionPrivate::dhParamsAnswered() { return restart(); } - uint32 nlen = _authKeyData->new_nonce.innerLength(), slen = _authKeyData->server_nonce.innerLength(); + uint32 nlen = tl::count_length(_authKeyData->new_nonce), slen = tl::count_length(_authKeyData->server_nonce); uchar tmp_aes[1024], sha1ns[20], sha1sn[20], sha1nn[20]; memcpy(tmp_aes, &_authKeyData->new_nonce, nlen); memcpy(tmp_aes + nlen, &_authKeyData->server_nonce, slen); @@ -2889,7 +2889,7 @@ void ConnectionPrivate::dhClientParamsSend() { } std::string ConnectionPrivate::encryptClientDHInner(const MTPClient_DH_Inner_Data &data) { - auto client_dh_inner_size = data.innerLength(); + auto client_dh_inner_size = tl::count_length(data); auto encSize = (client_dh_inner_size >> 2) + 5; auto encFullSize = encSize; if (encSize & 0x03) { diff --git a/Telegram/SourceFiles/mtproto/connection_abstract.h b/Telegram/SourceFiles/mtproto/connection_abstract.h index e6e40129c..b524388e3 100644 --- a/Telegram/SourceFiles/mtproto/connection_abstract.h +++ b/Telegram/SourceFiles/mtproto/connection_abstract.h @@ -145,7 +145,7 @@ template mtpBuffer AbstractConnection::prepareNotSecurePacket( const Request &request, mtpMsgId newId) const { - const auto intsSize = request.innerLength() >> 2; + const auto intsSize = tl::count_length(request) >> 2; const auto intsPadding = requiresExtendedPadding() ? uint32(rand_value() & 0x3F) : 0; diff --git a/Telegram/SourceFiles/mtproto/core_types.cpp b/Telegram/SourceFiles/mtproto/core_types.cpp index 0f1d7e2e9..7a5a8bc1f 100644 --- a/Telegram/SourceFiles/mtproto/core_types.cpp +++ b/Telegram/SourceFiles/mtproto/core_types.cpp @@ -52,25 +52,6 @@ SecureRequest SecureRequest::Prepare(uint32 size, uint32 reserveSize) { return result; } -uint32 SecureRequest::innerLength() const { - if (!_data || _data->size() <= kMessageBodyPosition) { - return 0; - } - return (*_data)[kMessageLengthPosition]; -} - -void SecureRequest::write(mtpBuffer &to) const { - if (!_data || _data->size() <= kMessageBodyPosition) { - return; - } - uint32 was = to.size(), s = innerLength() / sizeof(mtpPrime); - to.resize(was + s); - memcpy( - to.data() + was, - _data->constData() + kMessageBodyPosition, - s * sizeof(mtpPrime)); -} - SecureRequestData *SecureRequest::operator->() const { Expects(_data != nullptr); @@ -90,7 +71,7 @@ SecureRequest::operator bool() const { void SecureRequest::addPadding(bool extended) { if (_data->size() <= kMessageBodyPosition) return; - const auto requestSize = (innerLength() >> 2); + const auto requestSize = (tl::count_length(*this) >> 2); const auto padding = CountPaddingAmountInInts(requestSize, extended); const auto fullSize = kMessageBodyPosition + requestSize + padding; if (uint32(_data->size()) != fullSize) { @@ -107,7 +88,7 @@ uint32 SecureRequest::messageSize() const { if (_data->size() <= kMessageBodyPosition) { return 0; } - const auto ints = (innerLength() >> 2); + const auto ints = (tl::count_length(*this) >> 2); return kMessageIdInts + kSeqNoInts + kMessageLengthInts + ints; } @@ -145,64 +126,20 @@ bool SecureRequest::needAck() const { return true; } +size_t SecureRequest::sizeInBytes() const { + return (_data && _data->size() > kMessageBodyPosition) + ? (*_data)[kMessageLengthPosition] + : 0; +} + +const void *SecureRequest::dataInBytes() const { + return (_data && _data->size() > kMessageBodyPosition) + ? (_data->constData() + kMessageBodyPosition) + : nullptr; +} + } // namespace MTP -uint32 MTPstring::innerLength() const { - uint32 l = v.length(); - if (l < 254) { - l += 1; - } else { - l += 4; - } - uint32 d = l & 0x03; - if (d) l += (4 - d); - return l; -} - -bool MTPstring::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { - if (from + 1 > end || cons != mtpc_string) { - return false; - } - - uint32 l; - const uchar *buf = (const uchar*)from; - if (buf[0] == 254) { - l = (uint32)buf[1] + ((uint32)buf[2] << 8) + ((uint32)buf[3] << 16); - buf += 4; - from += ((l + 4) >> 2) + (((l + 4) & 0x03) ? 1 : 0); - } else { - l = (uint32)buf[0]; - ++buf; - from += ((l + 1) >> 2) + (((l + 1) & 0x03) ? 1 : 0); - } - if (from > end) { - return false; - } - - v = QByteArray(reinterpret_cast(buf), l); - return true; -} - -void MTPstring::write(mtpBuffer &to) const { - uint32 l = v.length(), s = l + ((l < 254) ? 1 : 4), was = to.size(); - if (s & 0x03) { - s += 4; - } - s >>= 2; - to.resize(was + s); - char *buf = (char*)&to[was]; - if (l < 254) { - uchar sl = (uchar)l; - *(buf++) = *(char*)(&sl); - } else { - *(buf++) = (char)254; - *(buf++) = (char)(l & 0xFF); - *(buf++) = (char)((l >> 8) & 0xFF); - *(buf++) = (char)((l >> 16) & 0xFF); - } - memcpy(buf, v.constData(), l); -} - bool mtpTextSerializeCore(MTPStringLogger &to, const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons, uint32 level, mtpPrime vcons) { switch (mtpTypeId(cons)) { case mtpc_int: { diff --git a/Telegram/SourceFiles/mtproto/core_types.h b/Telegram/SourceFiles/mtproto/core_types.h index 7eebb9172..3d666d038 100644 --- a/Telegram/SourceFiles/mtproto/core_types.h +++ b/Telegram/SourceFiles/mtproto/core_types.h @@ -156,8 +156,12 @@ public: static SecureRequest Serialize(const Request &request); // For template MTP requests and MTPBoxed instanciation. - uint32 innerLength() const; - void write(mtpBuffer &to) const; + template + void write(Accumulator &to) const { + if (const auto size = sizeInBytes()) { + tl::Writer::PutBytes(to, dataInBytes(), size); + } + } SecureRequestData *operator->() const; SecureRequestData &operator*() const; @@ -176,6 +180,9 @@ public: private: explicit SecureRequest(const details::SecureRequestCreateTag &); + [[nodiscard]] size_t sizeInBytes() const; + [[nodiscard]] const void *dataInBytes() const; + std::shared_ptr _data; }; @@ -197,9 +204,9 @@ public: template SecureRequest SecureRequest::Serialize(const Request &request) { - const auto requestSize = request.innerLength() >> 2; + const auto requestSize = tl::count_length(request) >> 2; auto serialized = Prepare(requestSize); - request.write(*serialized); + request.template write(*serialized); return serialized; } @@ -394,3 +401,62 @@ inline QString mtpTextSerialize(const mtpPrime *&from, const mtpPrime *end) { [[maybe_unused]] bool result = mtpTextSerializeType(to, from, end, mtpc_core_message); return QString::fromUtf8(to.p, to.size); } + +namespace tl { + +template +struct Writer; + +template +struct Reader; + +template <> +struct Writer { + static void PutBytes(mtpBuffer &to, const void *bytes, uint32 count) { + constexpr auto kPrime = sizeof(uint32); + const auto primes = (count / kPrime) + (count % kPrime ? 1 : 0); + const auto size = to.size(); + to.resize(size + primes); + memcpy(to.data() + size, bytes, count); + } + static void Put(mtpBuffer &to, uint32 value) { + to.push_back(mtpPrime(value)); + } +}; + +template <> +struct Reader final { + [[nodiscard]] static bool HasBytes( + uint32 count, + const mtpPrime *from, + const mtpPrime *end) { + constexpr auto kPrime = sizeof(uint32); + const auto primes = (count / kPrime) + (count % kPrime ? 1 : 0); + return (end - from) >= primes; + } + static void GetBytes( + void *bytes, + uint32 count, + const mtpPrime *&from, + const mtpPrime *end) { + Expects(HasBytes(count, from, end)); + + constexpr auto kPrime = sizeof(uint32); + const auto primes = (count / kPrime) + (count % kPrime ? 1 : 0); + memcpy(bytes, from, count); + from += primes; + } + [[nodiscard]] static bool Has( + uint32 primes, + const mtpPrime *from, + const mtpPrime *end) { + return (end - from) >= primes; + } + [[nodiscard]] static uint32 Get(const mtpPrime *&from, const mtpPrime *end) { + Expects(from < end); + + return uint32(*from++); + } +}; + +} // namespace tl diff --git a/Telegram/codegen b/Telegram/codegen index 3a61c3a32..f1202034e 160000 --- a/Telegram/codegen +++ b/Telegram/codegen @@ -1 +1 @@ -Subproject commit 3a61c3a32c51e652f639ae506201a31db48359f1 +Subproject commit f1202034e2466475eee86b03d880c8c5d9d56988 diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp index cf3e1619c..e173e6174 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -123,9 +123,9 @@ '