procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't bind key for more than 10 seconds.

This commit is contained in:
John Preston 2019-12-02 16:30:33 +03:00
parent 91f50e8bdc
commit 907965531c
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Telegram/SourceFiles/mtproto/session_private.cpp
View File

@ -216,31 +216,30 @@ int16 SessionPrivate::getProtocolDcId() const {
void SessionPrivate::checkSentRequests() { void SessionPrivate::checkSentRequests() {
clearOldContainers(); clearOldContainers();
auto restarting = false; const auto now = crl::now();
if (_bindMsgId && _bindMessageSent + kCheckSentRequestTimeout < now) {
DEBUG_LOG(("MTP Info: "
"Request state while key is not bound, restarting."));
restart();
return;
}
auto requesting = false; auto requesting = false;
{ {
QReadLocker locker(_sessionData->haveSentMutex()); QReadLocker locker(_sessionData->haveSentMutex());
auto &haveSent = _sessionData->haveSentMap(); auto &haveSent = _sessionData->haveSentMap();
const auto haveSentCount = haveSent.size(); const auto haveSentCount = haveSent.size();
const auto now = crl::now();
const auto checkAfter = kCheckSentRequestTimeout; const auto checkAfter = kCheckSentRequestTimeout;
for (const auto &[msgId, request] : haveSent) { for (const auto &[msgId, request] : haveSent) {
if (request->lastSentTime + checkAfter < now) { if (request->lastSentTime + checkAfter < now) {
// Need to check state. // Need to check state.
request->lastSentTime = now; request->lastSentTime = now;
if (_bindMsgId) { if (_stateRequestData.emplace(msgId).second) {
restarting = true;
} else if (_stateRequestData.emplace(msgId).second) {
requesting = true; requesting = true;
} }
} }
} }
} }
if (restarting) { if (requesting) {
DEBUG_LOG(("MTP Info: "
"Request state while key is not bound, restarting."));
restart();
} else if (requesting) {
_sessionData->queueSendAnything(kSendStateRequestWaiting); _sessionData->queueSendAnything(kSendStateRequestWaiting);
} }
} }
@ -683,6 +682,7 @@ void SessionPrivate::tryToSend() {
forceNewMsgId && !bindDcKeyRequest); forceNewMsgId && !bindDcKeyRequest);
if (bindDcKeyRequest) { if (bindDcKeyRequest) {
_bindMsgId = msgId; _bindMsgId = msgId;
_bindMessageSent = crl::now();
needAnyResponse = true; needAnyResponse = true;
} else if (pingRequest) { } else if (pingRequest) {
_pingMsgId = msgId; _pingMsgId = msgId;
@ -779,6 +779,7 @@ void SessionPrivate::tryToSend() {
bigMsgId, bigMsgId,
false, false,
bindDcKeyRequest); bindDcKeyRequest);
_bindMessageSent = crl::now();
needAnyResponse = true; needAnyResponse = true;
} }
if (pingRequest) { if (pingRequest) {
@ -1854,6 +1855,8 @@ SessionPrivate::HandleResult SessionPrivate::handleBindResponse(
if (!_keyCreator || !_bindMsgId || _bindMsgId != requestMsgId) { if (!_keyCreator || !_bindMsgId || _bindMsgId != requestMsgId) {
return HandleResult::Ignored; return HandleResult::Ignored;
} }
_bindMsgId = 0;
const auto result = _keyCreator->handleBindResponse(response); const auto result = _keyCreator->handleBindResponse(response);
switch (result) { switch (result) {
case DcKeyBindState::Success: case DcKeyBindState::Success:

1
Telegram/SourceFiles/mtproto/session_private.h
View File

@ -221,6 +221,7 @@ private:
std::unique_ptr<BoundKeyCreator> _keyCreator; std::unique_ptr<BoundKeyCreator> _keyCreator;
mtpMsgId _bindMsgId = 0; mtpMsgId _bindMsgId = 0;
crl::time _bindMessageSent = 0;
}; };