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

applying flags from dcOptions

This commit is contained in:
John Preston 2016-02-23 12:52:18 +03:00
parent 2a0a3b5cbb
commit 0ffc2ce141
6 changed files with 141 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/config.h
View File

@ -55,7 +55,7 @@ enum {
MTPDownloadSessionsCount = 4, // max 4 download sessions is created MTPDownloadSessionsCount = 4, // max 4 download sessions is created
MTPKillFileSessionTimeout = 5000, // how much time without upload / download causes additional session kill MTPKillFileSessionTimeout = 5000, // how much time without upload / download causes additional session kill
MTPEnumDCTimeout = 4000, // 4 seconds timeout for help_getConfig to work (them move to other dc) MTPEnumDCTimeout = 8000, // 8 seconds timeout for help_getConfig to work (then move to other dc)
MTPDebugBufferSize = 1024 * 1024, // 1 mb start size MTPDebugBufferSize = 1024 * 1024, // 1 mb start size

19
Telegram/SourceFiles/mtproto/mtp.cpp
View File

@ -622,7 +622,24 @@ namespace _mtp_internal {
namespace MTP { namespace MTP {
void start() { const uint32 cfg = 1 * _mtp_internal::dcShift; // send(MTPhelp_GetConfig(), MTP::cfg + dc) - for dc enum
const uint32 lgt = 2 * _mtp_internal::dcShift; // send(MTPauth_LogOut(), MTP::lgt + dc) - for logout of guest dcs enum
const uint32 dld[MTPDownloadSessionsCount] = { // send(req, callbacks, MTP::dld[i] + dc) - for download
0x10 * _mtp_internal::dcShift,
0x11 * _mtp_internal::dcShift,
0x12 * _mtp_internal::dcShift,
0x13 * _mtp_internal::dcShift,
};
const uint32 upl[MTPUploadSessionsCount] = { // send(req, callbacks, MTP::upl[i] + dc) - for upload
0x20 * _mtp_internal::dcShift,
0x21 * _mtp_internal::dcShift,
0x22 * _mtp_internal::dcShift,
0x23 * _mtp_internal::dcShift,
};
const uint32 dldStart = dld[0], dldEnd = dld[(sizeof(dld) / sizeof(dld[0])) - 1] + _mtp_internal::dcShift;
const uint32 uplStart = upl[0], uplEnd = upl[(sizeof(upl) / sizeof(upl[0])) - 1] + _mtp_internal::dcShift;
void start() {
if (started()) return; if (started()) return;
unixtimeInit(); unixtimeInit();

22
Telegram/SourceFiles/mtproto/mtp.h
View File

@ -68,20 +68,12 @@ namespace _mtp_internal {
namespace MTP { namespace MTP {
static const uint32 cfg = 1 * _mtp_internal::dcShift; // send(MTPhelp_GetConfig(), MTP::cfg + dc) - for dc enum extern const uint32 cfg; // send(MTPhelp_GetConfig(), MTP::cfg + dc) - for dc enum
static const uint32 lgt = 2 * _mtp_internal::dcShift; // send(MTPauth_LogOut(), MTP::lgt + dc) - for logout of guest dcs enum extern const uint32 lgt; // send(MTPauth_LogOut(), MTP::lgt + dc) - for logout of guest dcs enum
static const uint32 dld[MTPDownloadSessionsCount] = { // send(req, callbacks, MTP::dld[i] + dc) - for download extern const uint32 dld[MTPDownloadSessionsCount]; // send(req, callbacks, MTP::dld[i] + dc) - for download
0x10 * _mtp_internal::dcShift, extern const uint32 upl[MTPUploadSessionsCount]; // send(req, callbacks, MTP::upl[i] + dc) - for upload
0x11 * _mtp_internal::dcShift, extern const uint32 dldStart, dldEnd; // dc >= dldStart && dc < dldEnd => dc in dld
0x12 * _mtp_internal::dcShift, extern const uint32 uplStart, uplEnd; // dc >= uplStart && dc < uplEnd => dc in upl
0x13 * _mtp_internal::dcShift,
};
static const uint32 upl[MTPUploadSessionsCount] = { // send(req, callbacks, MTP::upl[i] + dc) - for upload
0x20 * _mtp_internal::dcShift,
0x21 * _mtp_internal::dcShift,
0x22 * _mtp_internal::dcShift,
0x23 * _mtp_internal::dcShift,
};
void start(); void start();
bool started(); bool started();
@ -119,7 +111,7 @@ namespace MTP {
void cancel(mtpRequestId req); void cancel(mtpRequestId req);
void killSession(int32 dc); void killSession(int32 dc);
void stopSession(int32 dc); void stopSession(int32 dc);
enum { enum {
RequestSent = 0, RequestSent = 0,
RequestConnecting = 1, RequestConnecting = 1,

139
Telegram/SourceFiles/mtproto/mtpConnection.cpp
View File

@ -623,8 +623,13 @@ void MTPabstractTcpConnection::socketRead() {
} while (sock.state() == QAbstractSocket::ConnectedState && sock.bytesAvailable()); } while (sock.state() == QAbstractSocket::ConnectedState && sock.bytesAvailable());
} }
MTPautoConnection::MTPautoConnection(QThread *thread) : status(WaitingBoth), MTPautoConnection::MTPautoConnection(QThread *thread) : MTPabstractTcpConnection()
tcpNonce(MTP::nonce<MTPint128>()), httpNonce(MTP::nonce<MTPint128>()), _tcpTimeout(MTPMinReceiveDelay), _flags(0) { , status(WaitingBoth)
, tcpNonce(MTP::nonce<MTPint128>())
, httpNonce(MTP::nonce<MTPint128>())
, _flagsTcp(0)
, _flagsHttp(0)
, _tcpTimeout(MTPMinReceiveDelay) {
moveToThread(thread); moveToThread(thread);
manager.moveToThread(thread); manager.moveToThread(thread);
@ -647,7 +652,7 @@ tcpNonce(MTP::nonce<MTPint128>()), httpNonce(MTP::nonce<MTPint128>()), _tcpTimeo
void MTPautoConnection::onHttpStart() { void MTPautoConnection::onHttpStart() {
if (status == HttpReady) { if (status == HttpReady) {
DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by timer").arg((_flags & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4")); DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by timer").arg((_flagsHttp & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4"));
status = UsingHttp; status = UsingHttp;
sock.disconnectFromHost(); sock.disconnectFromHost();
emit connected(); emit connected();
@ -658,7 +663,7 @@ void MTPautoConnection::onSocketConnected() {
if (status == HttpReady || status == WaitingBoth || status == WaitingTcp) { if (status == HttpReady || status == WaitingBoth || status == WaitingTcp) {
mtpBuffer buffer(_preparePQFake(tcpNonce)); mtpBuffer buffer(_preparePQFake(tcpNonce));
DEBUG_LOG(("Connection Info: sending fake req_pq through TCP/%1 transport").arg((_flags & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4")); DEBUG_LOG(("Connection Info: sending fake req_pq through TCP/%1 transport").arg((_flagsTcp & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4"));
if (_tcpTimeout < 0) _tcpTimeout = -_tcpTimeout; if (_tcpTimeout < 0) _tcpTimeout = -_tcpTimeout;
tcpTimeoutTimer.start(_tcpTimeout); tcpTimeoutTimer.start(_tcpTimeout);
@ -678,7 +683,7 @@ void MTPautoConnection::onTcpTimeoutTimer() {
if (state == QAbstractSocket::ConnectedState || state == QAbstractSocket::ConnectingState || state == QAbstractSocket::HostLookupState) { if (state == QAbstractSocket::ConnectedState || state == QAbstractSocket::ConnectingState || state == QAbstractSocket::HostLookupState) {
sock.disconnectFromHost(); sock.disconnectFromHost();
} else if (state != QAbstractSocket::ClosingState) { } else if (state != QAbstractSocket::ClosingState) {
sock.connectToHost(QHostAddress(_addr), _port); sock.connectToHost(QHostAddress(_addrTcp), _portTcp);
} }
} }
} }
@ -687,7 +692,7 @@ void MTPautoConnection::onSocketDisconnected() {
if (_tcpTimeout < 0) { if (_tcpTimeout < 0) {
_tcpTimeout = -_tcpTimeout; _tcpTimeout = -_tcpTimeout;
if (status == HttpReady || status == WaitingBoth || status == WaitingTcp) { if (status == HttpReady || status == WaitingBoth || status == WaitingTcp) {
sock.connectToHost(QHostAddress(_addr), _port); sock.connectToHost(QHostAddress(_addrTcp), _portTcp);
return; return;
} }
} }
@ -696,7 +701,7 @@ void MTPautoConnection::onSocketDisconnected() {
} else if (status == WaitingTcp || status == UsingTcp) { } else if (status == WaitingTcp || status == UsingTcp) {
emit disconnected(); emit disconnected();
} else if (status == HttpReady) { } else if (status == HttpReady) {
DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by socket disconnect").arg((_flags & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4")); DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by socket disconnect").arg((_flagsHttp & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4"));
status = UsingHttp; status = UsingHttp;
emit connected(); emit connected();
} }
@ -788,21 +793,27 @@ void MTPautoConnection::disconnectFromServer() {
httpStartTimer.stop(); httpStartTimer.stop();
} }
void MTPautoConnection::connectToServer(const QString &addr, int32 port, int32 flags) { void MTPautoConnection::connectTcp(const QString &addr, int32 port, int32 flags) {
_addrTcp = addr;
_portTcp = port;
_flagsTcp = flags;
connect(&sock, SIGNAL(readyRead()), this, SLOT(socketRead()));
sock.connectToHost(QHostAddress(_addrTcp), _portTcp);
}
void MTPautoConnection::connectHttp(const QString &addr, int32 port, int32 flags) {
address = QUrl(((flags & MTPDdcOption::flag_ipv6) ? qsl("http://[%1]:%2/api") : qsl("http://%1:%2/api")).arg(addr).arg(80));//not p - always 80 port for http transport address = QUrl(((flags & MTPDdcOption::flag_ipv6) ? qsl("http://[%1]:%2/api") : qsl("http://%1:%2/api")).arg(addr).arg(80));//not p - always 80 port for http transport
TCP_LOG(("HTTP Info: address is %1").arg(address.toDisplayString())); TCP_LOG(("HTTP Info: address is %1").arg(address.toDisplayString()));
connect(&manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestFinished(QNetworkReply*))); connect(&manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestFinished(QNetworkReply*)));
_addr = addr; _addrHttp = addr;
_port = port; _portHttp = port;
_flags = flags; _flagsHttp = flags;
connect(&sock, SIGNAL(readyRead()), this, SLOT(socketRead()));
sock.connectToHost(QHostAddress(_addr), _port);
mtpBuffer buffer(_preparePQFake(httpNonce)); mtpBuffer buffer(_preparePQFake(httpNonce));
DEBUG_LOG(("Connection Info: sending fake req_pq through HTTP/%1 transport").arg((_flags & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4")); DEBUG_LOG(("Connection Info: sending fake req_pq through HTTP/%1 transport").arg((_flagsHttp & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4"));
httpSend(buffer); httpSend(buffer);
} }
@ -838,7 +849,7 @@ void MTPautoConnection::requestFinished(QNetworkReply *reply) {
status = HttpReady; status = HttpReady;
httpStartTimer.start(MTPTcpConnectionWaitTimeout); httpStartTimer.start(MTPTcpConnectionWaitTimeout);
} else { } else {
DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by pq-response, awaited").arg((_flags & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4")); DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by pq-response, awaited").arg((_flagsHttp & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4"));
status = UsingHttp; status = UsingHttp;
sock.disconnectFromHost(); sock.disconnectFromHost();
emit connected(); emit connected();
@ -881,7 +892,7 @@ void MTPautoConnection::socketPacket(const char *packet, uint32 length) {
status = WaitingHttp; status = WaitingHttp;
sock.disconnectFromHost(); sock.disconnectFromHost();
} else if (status == HttpReady) { } else if (status == HttpReady) {
DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by bad tcp response, ready").arg((_flags & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4")); DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by bad tcp response, ready").arg((_flagsHttp & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4"));
status = UsingHttp; status = UsingHttp;
sock.disconnectFromHost(); sock.disconnectFromHost();
emit connected(); emit connected();
@ -900,7 +911,7 @@ void MTPautoConnection::socketPacket(const char *packet, uint32 length) {
MTPResPQ res_pq = _readPQFakeReply(data); MTPResPQ res_pq = _readPQFakeReply(data);
const MTPDresPQ &res_pq_data(res_pq.c_resPQ()); const MTPDresPQ &res_pq_data(res_pq.c_resPQ());
if (res_pq_data.vnonce == tcpNonce) { if (res_pq_data.vnonce == tcpNonce) {
DEBUG_LOG(("Connection Info: TCP/%1-transport chosen by pq-response").arg((_flags & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4")); DEBUG_LOG(("Connection Info: TCP/%1-transport chosen by pq-response").arg((_flagsTcp & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4"));
status = UsingTcp; status = UsingTcp;
emit connected(); emit connected();
} }
@ -910,7 +921,7 @@ void MTPautoConnection::socketPacket(const char *packet, uint32 length) {
status = WaitingHttp; status = WaitingHttp;
sock.disconnectFromHost(); sock.disconnectFromHost();
} else if (status == HttpReady) { } else if (status == HttpReady) {
DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by bad tcp response, awaited").arg((_flags & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4")); DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by bad tcp response, awaited").arg((_flagsHttp & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4"));
status = UsingHttp; status = UsingHttp;
sock.disconnectFromHost(); sock.disconnectFromHost();
emit connected(); emit connected();
@ -950,7 +961,7 @@ void MTPautoConnection::socketError(QAbstractSocket::SocketError e) {
if (status == WaitingBoth) { if (status == WaitingBoth) {
status = WaitingHttp; status = WaitingHttp;
} else if (status == HttpReady) { } else if (status == HttpReady) {
DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by tcp error, ready").arg((_flags & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4")); DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by tcp error, ready").arg((_flagsHttp & MTPDdcOption::flag_ipv6) ? "IPv6" : "IPv4"));
status = UsingHttp; status = UsingHttp;
emit connected(); emit connected();
} else if (status == WaitingTcp || status == UsingTcp) { } else if (status == WaitingTcp || status == UsingTcp) {
@ -1064,7 +1075,7 @@ void MTPtcpConnection::disconnectFromServer() {
sock.close(); sock.close();
} }
void MTPtcpConnection::connectToServer(const QString &addr, int32 port, int32 flags) { void MTPtcpConnection::connectTcp(const QString &addr, int32 port, int32 flags) {
_addr = addr; _addr = addr;
_port = port; _port = port;
_flags = flags; _flags = flags;
@ -1161,7 +1172,7 @@ void MTPhttpConnection::disconnectFromServer() {
address = QUrl(); address = QUrl();
} }
void MTPhttpConnection::connectToServer(const QString &addr, int32 p, int32 flags) { void MTPhttpConnection::connectHttp(const QString &addr, int32 p, int32 flags) {
address = QUrl(((flags & MTPDdcOption::flag_ipv6) ? qsl("http://[%1]:%2/api") : qsl("http://%1:%2/api")).arg(addr).arg(80));//not p - always 80 port for http transport address = QUrl(((flags & MTPDdcOption::flag_ipv6) ? qsl("http://[%1]:%2/api") : qsl("http://%1:%2/api")).arg(addr).arg(80));//not p - always 80 port for http transport
TCP_LOG(("HTTP Info: address is %1").arg(address.toDisplayString())); TCP_LOG(("HTTP Info: address is %1").arg(address.toDisplayString()));
connect(&manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestFinished(QNetworkReply*))); connect(&manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestFinished(QNetworkReply*)));
@ -1955,34 +1966,70 @@ void MTProtoConnectionPrivate::restartNow() {
} }
void MTProtoConnectionPrivate::socketStart(bool afterConfig) { void MTProtoConnectionPrivate::socketStart(bool afterConfig) {
int32 flags4 = 0, flags6 = 0; bool isDldDc = (dc >= MTP::dldStart) && (dc < MTP::dldEnd);
std::string ip4, ip6; int32 baseDc = (dc % _mtp_internal::dcShift);
uint32 port4 = 0, port6 = 0;
static const int IPv4address = 0, IPv6address = 1;
static const int TcpProtocol = 0, HttpProtocol = 1;
int32 flags[2][2] = { { 0 } };
string ip[2][2];
uint32 port[2][2] = { { 0 } };
{ {
QReadLocker lock(mtpDcOptionsMutex()); QReadLocker lock(mtpDcOptionsMutex());
const mtpDcOptions &options(cDcOptions()); const mtpDcOptions &options(cDcOptions());
mtpDcOptions::const_iterator dcIndex4 = options.constFind(dc % _mtp_internal::dcShift); int32 shifts[2][2][4] = {
if (dcIndex4 != options.cend()) { { // IPv4
ip4 = dcIndex4->ip; { // TCP IPv4
flags4 = dcIndex4->flags; isDldDc ? (MTPDdcOption::flag_media_only | MTPDdcOption::flag_tcpo_only) : -1,
port4 = dcIndex4->port; MTPDdcOption::flag_tcpo_only,
} isDldDc ? (MTPDdcOption::flag_media_only) : -1,
mtpDcOptions::const_iterator dcIndex6 = options.constFind((dc % _mtp_internal::dcShift) + (_mtp_internal::dcShift * MTPDdcOption::flag_ipv6)); 0
if (dcIndex6 != options.cend()) { }, { // HTTP IPv4
ip6 = dcIndex6->ip; -1,
flags6 = dcIndex6->flags; -1,
port6 = dcIndex6->port; isDldDc ? (MTPDdcOption::flag_media_only) : -1,
0
},
}, { // IPv6
{ // TCP IPv6
isDldDc ? (MTPDdcOption::flag_media_only | MTPDdcOption::flag_tcpo_only | MTPDdcOption::flag_ipv6) : -1,
MTPDdcOption::flag_tcpo_only | MTPDdcOption::flag_ipv6,
isDldDc ? (MTPDdcOption::flag_media_only | MTPDdcOption::flag_ipv6) : -1,
MTPDdcOption::flag_ipv6
}, { // HTTP IPv6
-1,
-1,
isDldDc ? (MTPDdcOption::flag_media_only | MTPDdcOption::flag_ipv6) : -1,
MTPDdcOption::flag_ipv6
},
},
};
for (int32 address = 0, acount = sizeof(shifts) / sizeof(shifts[0]); address < acount; ++address) {
for (int32 protocol = 0, pcount = sizeof(shifts[0]) / sizeof(shifts[0][0]); protocol < pcount; ++protocol) {
for (int32 shift = 0, scount = sizeof(shifts[0][0]) / sizeof(shifts[0][0][0]); shift < scount; ++shift) {
int32 mask = shifts[address][protocol][shift];
if (mask < 0) continue;
mtpDcOptions::const_iterator index = options.constFind(baseDc + _mtp_internal::dcShift * mask);
if (index != options.cend()) {
ip[address][protocol] = index->ip;
flags[address][protocol] = index->flags;
port[address][protocol] = index->port;
break;
}
}
}
} }
} }
bool noIPv4 = (!port4 || ip4.empty()), noIPv6 = (!cTryIPv6() || !port6 || ip6.empty()); bool noIPv4 = !port[IPv4address][HttpProtocol], noIPv6 = (!cTryIPv6() || !port[IPv6address][HttpProtocol]);
if (noIPv4 && noIPv6) { if (noIPv4 && noIPv6) {
if (afterConfig) { if (afterConfig) {
if (noIPv4) LOG(("MTP Error: DC %1 options for IPv4 not found right after config load!").arg(dc)); if (noIPv4) LOG(("MTP Error: DC %1 options for IPv4 over HTTP not found right after config load!").arg(dc));
if (cTryIPv6() && noIPv6) LOG(("MTP Error: DC %1 options for IPv6 not found right after config load!").arg(dc)); if (cTryIPv6() && noIPv6) LOG(("MTP Error: DC %1 options for IPv6 over HTTP not found right after config load!").arg(dc));
return restart(); return restart();
} }
if (noIPv4) DEBUG_LOG(("MTP Info: DC %1 options for IPv4 not found, waiting for config").arg(dc)); if (noIPv4) DEBUG_LOG(("MTP Info: DC %1 options for IPv4 over HTTP not found, waiting for config").arg(dc));
if (cTryIPv6() && noIPv6) DEBUG_LOG(("MTP Info: DC %1 options for IPv6 not found, waiting for config").arg(dc)); if (cTryIPv6() && noIPv6) DEBUG_LOG(("MTP Info: DC %1 options for IPv6 over HTTP not found, waiting for config").arg(dc));
connect(mtpConfigLoader(), SIGNAL(loaded()), this, SLOT(onConfigLoaded())); connect(mtpConfigLoader(), SIGNAL(loaded()), this, SLOT(onConfigLoaded()));
mtpConfigLoader()->load(); mtpConfigLoader()->load();
return; return;
@ -1998,19 +2045,21 @@ void MTProtoConnectionPrivate::socketStart(bool afterConfig) {
_pingId = _pingMsgId = _pingIdToSend = _pingSendAt = 0; _pingId = _pingMsgId = _pingIdToSend = _pingSendAt = 0;
_pingSender.stop(); _pingSender.stop();
if (!noIPv4) DEBUG_LOG(("MTP Info: creating IPv4 connection to %1:%2..").arg(ip4.c_str()).arg(port4)); if (!noIPv4) DEBUG_LOG(("MTP Info: creating IPv4 connection to %1:%2 (tcp) and %1:%2 (http)..").arg(ip[IPv4address][TcpProtocol].c_str()).arg(port[IPv4address][TcpProtocol]).arg(ip[IPv4address][HttpProtocol].c_str()).arg(port[IPv4address][HttpProtocol]));
if (!noIPv6) DEBUG_LOG(("MTP Info: creating IPv6 connection to [%1]:%2..").arg(ip6.c_str()).arg(port6)); if (!noIPv6) DEBUG_LOG(("MTP Info: creating IPv4 connection to [%1]:%2 (tcp) and [%1]:%2 (http)..").arg(ip[IPv6address][TcpProtocol].c_str()).arg(port[IPv6address][TcpProtocol]).arg(ip[IPv4address][HttpProtocol].c_str()).arg(port[IPv4address][HttpProtocol]));
_waitForConnectedTimer.start(_waitForConnected); _waitForConnectedTimer.start(_waitForConnected);
if (_conn4) { if (_conn4) {
connect(_conn4, SIGNAL(connected()), this, SLOT(onConnected4())); connect(_conn4, SIGNAL(connected()), this, SLOT(onConnected4()));
connect(_conn4, SIGNAL(disconnected()), this, SLOT(onDisconnected4())); connect(_conn4, SIGNAL(disconnected()), this, SLOT(onDisconnected4()));
_conn4->connectToServer(ip4.c_str(), port4, flags4); _conn4->connectTcp(ip[IPv4address][TcpProtocol].c_str(), port[IPv4address][TcpProtocol], flags[IPv4address][TcpProtocol]);
_conn4->connectHttp(ip[IPv4address][HttpProtocol].c_str(), port[IPv4address][HttpProtocol], flags[IPv4address][HttpProtocol]);
} }
if (_conn6) { if (_conn6) {
connect(_conn6, SIGNAL(connected()), this, SLOT(onConnected6())); connect(_conn6, SIGNAL(connected()), this, SLOT(onConnected6()));
connect(_conn6, SIGNAL(disconnected()), this, SLOT(onDisconnected6())); connect(_conn6, SIGNAL(disconnected()), this, SLOT(onDisconnected6()));
_conn6->connectToServer(ip6.c_str(), port6, flags6); _conn6->connectTcp(ip[IPv6address][TcpProtocol].c_str(), port[IPv6address][TcpProtocol], flags[IPv6address][TcpProtocol]);
_conn6->connectHttp(ip[IPv6address][HttpProtocol].c_str(), port[IPv6address][HttpProtocol], flags[IPv6address][HttpProtocol]);
} }
} }

19
Telegram/SourceFiles/mtproto/mtpConnection.h
View File

@ -113,7 +113,8 @@ public:
virtual void sendData(mtpBuffer &buffer) = 0; // has size + 3, buffer[0] = len, buffer[1] = packetnum, buffer[last] = crc32 virtual void sendData(mtpBuffer &buffer) = 0; // has size + 3, buffer[0] = len, buffer[1] = packetnum, buffer[last] = crc32
virtual void disconnectFromServer() = 0; virtual void disconnectFromServer() = 0;
virtual void connectToServer(const QString &addr, int32 port, int32 flags) = 0; virtual void connectTcp(const QString &addr, int32 port, int32 flags) = 0;
virtual void connectHttp(const QString &addr, int32 port, int32 flags) = 0;
virtual bool isConnected() const = 0; virtual bool isConnected() const = 0;
virtual bool usingHttpWait() { virtual bool usingHttpWait() {
return false; return false;
@ -181,7 +182,8 @@ public:
void sendData(mtpBuffer &buffer); void sendData(mtpBuffer &buffer);
void disconnectFromServer(); void disconnectFromServer();
void connectToServer(const QString &addr, int32 port, int32 flags); void connectTcp(const QString &addr, int32 port, int32 flags);
void connectHttp(const QString &addr, int32 port, int32 flags);
bool isConnected() const; bool isConnected() const;
bool usingHttpWait(); bool usingHttpWait();
bool needHttpWait(); bool needHttpWait();
@ -228,8 +230,9 @@ private:
typedef QSet<QNetworkReply*> Requests; typedef QSet<QNetworkReply*> Requests;
Requests requests; Requests requests;
QString _addr; QString _addrTcp, _addrHttp;
int32 _port, _tcpTimeout, _flags; int32 _portTcp, _portHttp, _flagsTcp, _flagsHttp;
int32 _tcpTimeout;
QTimer tcpTimeoutTimer; QTimer tcpTimeoutTimer;
}; };
@ -243,7 +246,9 @@ public:
void sendData(mtpBuffer &buffer); void sendData(mtpBuffer &buffer);
void disconnectFromServer(); void disconnectFromServer();
void connectToServer(const QString &addr, int32 port, int32 flags); void connectTcp(const QString &addr, int32 port, int32 flags);
void connectHttp(const QString &addr, int32 port, int32 flags) { // not supported
}
bool isConnected() const; bool isConnected() const;
int32 debugState() const; int32 debugState() const;
@ -288,7 +293,9 @@ public:
void sendData(mtpBuffer &buffer); void sendData(mtpBuffer &buffer);
void disconnectFromServer(); void disconnectFromServer();
void connectToServer(const QString &addr, int32 port, int32 flags); void connectTcp(const QString &addr, int32 port, int32 flags) { // not supported
}
void connectHttp(const QString &addr, int32 port, int32 flags);
bool isConnected() const; bool isConnected() const;
bool usingHttpWait(); bool usingHttpWait();
bool needHttpWait(); bool needHttpWait();

12
Telegram/SourceFiles/mtproto/mtpDC.cpp
View File

@ -258,16 +258,20 @@ void MTProtoConfigLoader::enumDC() {
} else { } else {
MTP::killSession(MTP::cfg + _enumCurrent); MTP::killSession(MTP::cfg + _enumCurrent);
} }
OrderedSet<int32> dcs;
{ {
QReadLocker lock(mtpDcOptionsMutex()); QReadLocker lock(mtpDcOptionsMutex());
const mtpDcOptions &options(cDcOptions()); const mtpDcOptions &options(cDcOptions());
for (mtpDcOptions::const_iterator i = options.cbegin(), e = options.cend(); i != e; ++i) { for (mtpDcOptions::const_iterator i = options.cbegin(), e = options.cend(); i != e; ++i) {
if (i.key() == _enumCurrent) { dcs.insert(i.key() % _mtp_internal::dcShift);
_enumCurrent = (++i == e) ? options.cbegin().key() : i.key();
break;
}
} }
} }
OrderedSet<int32>::const_iterator i = dcs.constFind(_enumCurrent);
if (i == dcs.cend() || (++i) == dcs.cend()) {
_enumCurrent = dcs.cbegin().key();
} else {
_enumCurrent = i.key();
}
_enumRequest = MTP::send(MTPhelp_GetConfig(), rpcDone(configLoaded), rpcFail(configFailed), MTP::cfg + _enumCurrent); _enumRequest = MTP::send(MTPhelp_GetConfig(), rpcDone(configLoaded), rpcFail(configFailed), MTP::cfg + _enumCurrent);
_enumDCTimer.start(MTPEnumDCTimeout); _enumDCTimer.start(MTPEnumDCTimeout);